add selectors for charts (#1061)

Altinn · Feb 5, 2019 · d5091fa · d5091fa
1 parent 2b03d86
commit d5091fa
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 67 deletions.
diff --git a/deploy/kubernetes/altinncore-loadbalancer-dev-config.yaml b/deploy/kubernetes/altinncore-loadbalancer-dev-config.yaml
@@ -28,7 +28,7 @@ data:
 
       server {
         listen 80;
-        server_name altinn.studio;
+        server_name dev.altinn.studio;
         # Redirect all HTTP requests to HTTPS with a 301 Moved Permanently response.
         return 301 https://dev.altinn.studio$request_uri;
       }

diff --git a/deploy/kubernetes/helm-charts/altinn-designer/templates/deployment.yaml b/deploy/kubernetes/helm-charts/altinn-designer/templates/deployment.yaml
@@ -1,26 +1,22 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: altinn-designer
-  labels:
-    app.kubernetes.io/name: {{ include "altinn-designer.name" . }}
-    helm.sh/chart: {{ include "altinn-designer.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
+  selector:
+    matchLabels:
+      run: altinn-designer
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "altinn-designer.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        app: altinn-designer
+        run: altinn-designer
     spec:
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ required "image.tag not set" .Values.image.tag }}"
           ports:
-            - containerPort: {{ .Values.service.internalPort }}
+            - containerPort: {{ .Values.image.containerPort }}
           {{- if eq (required "evironment not set" .Values.environment) "development"}}
           env:
             {{- range $variable := .Values.environmentVariables.development }}

diff --git a/deploy/kubernetes/helm-charts/altinn-designer/templates/service.yaml b/deploy/kubernetes/helm-charts/altinn-designer/templates/service.yaml
@@ -3,12 +3,13 @@ kind: Service
 metadata:
   name: altinn-designer
   labels:
-    app.kubernetes.io/name: {{ include "altinn-designer.name" . }}
-    helm.sh/chart: {{ include "altinn-designer.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    run: altinn-designer
 spec:
   ports:
-    - port: {{ .Values.service.internalPort }}
+  {{- range $port := .Values.service.ports }}
+    - port: {{ $port.port }}
+      targetPort: {{ $port.targetPort }}
+      protocol: {{ $port.protocol }}
+  {{- end }}
   selector:
-    app: altinn-designer
+    run: altinn-designer
diff --git a/deploy/kubernetes/helm-charts/altinn-designer/values.yaml b/deploy/kubernetes/helm-charts/altinn-designer/values.yaml
@@ -70,4 +70,7 @@ volumes:
       secretName: altinn-appsettings-secret
 
 service:
-  internalPort: 5000
+  ports:
+    - port: 5000
+      protocol: TCP
+      targetPort: 5000
diff --git a/deploy/kubernetes/helm-charts/altinn-loadbalancer/templates/deployment.yaml b/deploy/kubernetes/helm-charts/altinn-loadbalancer/templates/deployment.yaml
@@ -1,18 +1,16 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: altinn-loadbalancer
-  labels:
-    app.kubernetes.io/name: {{ include "altinn-loadbalancer.name" . }}
-    helm.sh/chart: {{ include "altinn-loadbalancer.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
+  selector:
+    matchLabels:
+      run: altinn-loadbalancer
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:
       labels:
-        app: altinn-loadbalancer
+        run: altinn-loadbalancer
     spec:
       containers:
         - name: {{ .Chart.Name }}

diff --git a/deploy/kubernetes/helm-charts/altinn-loadbalancer/templates/service.yaml b/deploy/kubernetes/helm-charts/altinn-loadbalancer/templates/service.yaml
@@ -3,18 +3,17 @@ kind: Service
 metadata:
   name: altinn-loadbalancer
   labels:
-    app.kubernetes.io/name: {{ include "altinn-loadbalancer.name" . }}
-    helm.sh/chart: {{ include "altinn-loadbalancer.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    run: altinn-loablanacer
 spec:
   ports:
-    - port: {{ .Values.service.ports.http }}
-      name: http
-    - port: {{ .Values.service.ports.https }}
-      name: https
+  {{- range $port := .Values.service.ports }}
+    - port: {{ $port.port }}
+      targetPort: {{ $port.targetPort }}
+      protocol: {{ $port.protocol }}
+      name: {{ $port.name }}
+  {{- end }}
   selector:
-    app: altinn-loadbalancer
+    run: altinn-loadbalancer
   type: {{ .Values.service.type }}
   {{- if eq (required ".Values.environment must be set" .Values.environment) "development" }}
   loadBalancerIP: "40.113.5.36"

diff --git a/deploy/kubernetes/helm-charts/altinn-loadbalancer/values.yaml b/deploy/kubernetes/helm-charts/altinn-loadbalancer/values.yaml
@@ -24,7 +24,12 @@ volumes:
 
 service:
   type: LoadBalancer
-  loadBalancerIp:
   ports:
-    http: 80
-    https: 443
+    - port: 80
+      targetPort: 80
+      protocol: TCP
+      name: http
+    - port: 443
+      targetPort: 443
+      protocol: TCP
+      name: https
diff --git a/deploy/kubernetes/helm-charts/altinn-repositories/templates/deployment.yaml b/deploy/kubernetes/helm-charts/altinn-repositories/templates/deployment.yaml
@@ -1,19 +1,16 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: altinn-repositories
-  labels:
-    app.kubernetes.io/name: {{ include "altinn-repositories.name" . }}
-    helm.sh/chart: {{ include "altinn-repositories.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app: altinn-repositories
 spec:
+  selector:
+    matchLabels:
+      run: altinn-repositories
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:
       labels:
-        app: altinn-repositories
+        run: altinn-repositories
     spec:
       containers:
         - name: {{ .Chart.Name }}

diff --git a/deploy/kubernetes/helm-charts/altinn-repositories/templates/service.yaml b/deploy/kubernetes/helm-charts/altinn-repositories/templates/service.yaml
@@ -3,12 +3,13 @@ kind: Service
 metadata:
   name: altinn-repositories
   labels:
-    app.kubernetes.io/name: {{ include "altinn-repositories.name" . }}
-    helm.sh/chart: {{ include "altinn-repositories.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    run: altinn-repositories
 spec:
   ports:
-    - port: {{ .Values.service.internalPort }}
+  {{- range $port := .Values.service.ports}}
+    - port: {{ $port.port }}
+      targetPort: {{ $port.targetPort }}
+      protocol: {{ $port.protocol }}
+  {{- end }}
   selector:
-    app: altinn-repositories
+    run: altinn-repositories
diff --git a/deploy/kubernetes/helm-charts/altinn-repositories/values.yaml b/deploy/kubernetes/helm-charts/altinn-repositories/values.yaml
@@ -64,4 +64,7 @@ volumes:
       claimName: altinn-storage-gitea-volume-claim
 
 service:
-  internalPort: 3000
+  ports:
+    - port: 3000
+      targetPort: 3000
+      protocol: TCP
diff --git a/deploy/kubernetes/helm-charts/altinn-runtime/templates/deployment.yaml b/deploy/kubernetes/helm-charts/altinn-runtime/templates/deployment.yaml
@@ -2,19 +2,15 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: altinn-runtime
-  labels:
-    app.kubernetes.io/name: {{ include "altinn-runtime.name" . }}
-    helm.sh/chart: {{ include "altinn-runtime.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
+  selector:
+    matchLabels:
+      run: altinn-runtime
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "altinn-runtime.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        app: altinn-runtime
+        run: altinn-runtime
     spec:
       containers:
         - name: {{ .Chart.Name }}

diff --git a/deploy/kubernetes/helm-charts/altinn-runtime/templates/service.yaml b/deploy/kubernetes/helm-charts/altinn-runtime/templates/service.yaml
@@ -3,12 +3,13 @@ kind: Service
 metadata:
   name: altinn-runtime
   labels:
-    app.kubernetes.io/name: {{ include "altinn-runtime.name" . }}
-    helm.sh/chart: {{ include "altinn-runtime.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    run: altinn-runtime
 spec:
   ports:
-    - port: {{ .Values.service.internalPort }}
+  {{- range $port := .Values.service.ports }}
+    - port: {{ $port.port }}
+      targetPort:  {{ $port.targetPort }}
+      protocol:  {{ $port.protocol }}
+  {{- end }}
   selector:
-    app: altinn-runtime
+    run: altinn-runtime
diff --git a/deploy/kubernetes/helm-charts/altinn-runtime/values.yaml b/deploy/kubernetes/helm-charts/altinn-runtime/values.yaml
@@ -66,4 +66,7 @@ volumes:
       secretName: altinn-appsettings-secret
 
 service:
-  internalPort: 5005
+  ports:
+    - port: 5005
+      targetPort: 5005
+      protocol: TCP