Commit 53ca471a authored by Matthias's avatar Matthias
Browse files

Revert "Update labels on all resources to match."

This reverts commit 09e644ab.
parent 3243fba4
......@@ -2,11 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-config
namespace: "{{ .Values.k8sNamespace }}"
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
namespace: memobase
data:
ENV: {{ .Values.k8sEnvironment }}
TFV_KAFKA_SERVER_CONFIGS: {{ .Values.kafkaConfigs }}
......
apiVersion: networking.k8s.io/v1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
namespace: {{ .Values.k8sNamespace }}
name: {{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-ingress
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
......@@ -22,9 +18,6 @@ spec:
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-service"
port:
number: 5000
\ No newline at end of file
serviceName: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-service"
servicePort: 5000
\ No newline at end of file
......@@ -3,10 +3,6 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-service-account
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
---
#necessary role so that the service account can access the kubernetes api to list pods
kind: Role
......@@ -14,10 +10,6 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
namespace: {{ .Values.k8sNamespace }}
name: import-api-roles-{{ .Values.k8sEnvironment }}
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
rules:
- apiGroups: ["", "batch"] # "" indicates the core API group
resources: ["pods", "secrets", "configmaps", "jobs"]
......@@ -28,10 +20,6 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: import-api-roles-{{ .Values.k8sEnvironment }}
namespace: {{ .Values.k8sNamespace }}
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
subjects:
- kind: ServiceAccount
name: {{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-service-account
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment