Fix flower deployment on k8s (#191)

* Namespace k8s object names with release name * Remove unused kompose annotations
ascoderu · May 26, 2019 · efeed75 · efeed75
1 parent 2fd43b6
commit efeed75
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 55 deletions.
diff --git a/helm/templates/api-autoscaler.yaml b/helm/templates/api-autoscaler.yaml
@@ -2,12 +2,12 @@ apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
   creationTimestamp: null
-  name: api
+  name: {{ .Release.Name }}-api
 spec:
   maxReplicas: 9
   minReplicas: 3
   scaleTargetRef:
     apiVersion: extensions/v1beta1
     kind: Deployment
-    name: api
+    name: {{ .Release.Name }}-api
   targetCPUUtilizationPercentage: 75
diff --git a/helm/templates/api-deployment.yaml b/helm/templates/api-deployment.yaml
@@ -1,21 +1,18 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose convert --file=compose.yml --chart
-    kompose.version: 1.13.0 (84fa826)
   creationTimestamp: null
   labels:
-    io.kompose.service: api
-  name: api
+    io.kompose.service: {{ .Release.Name }}-api
+  name: {{ .Release.Name }}-api
 spec:
   replicas: 1
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: api
+        io.kompose.service: {{ .Release.Name }}-api
     spec:
       containers:
       - name: api

diff --git a/helm/templates/api-service.yaml b/helm/templates/api-service.yaml
@@ -1,19 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose convert --file=compose.yml --chart
-    kompose.version: 1.13.0 (84fa826)
   creationTimestamp: null
   labels:
-    io.kompose.service: api
-  name: api
+    io.kompose.service: {{ .Release.Name }}-api
+  name: {{ .Release.Name }}-api
 spec:
   ports:
   - name: "8080"
     port: 8080
     targetPort: 8080
   selector:
-    io.kompose.service: api
+    io.kompose.service: {{ .Release.Name }}-api
 status:
   loadBalancer: {}
diff --git a/helm/templates/flower-deployment.yaml b/helm/templates/flower-deployment.yaml
@@ -1,21 +1,18 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose convert --file=compose.yml --chart
-    kompose.version: 1.13.0 (84fa826)
   creationTimestamp: null
   labels:
-    io.kompose.service: flower
-  name: flower
+    io.kompose.service: {{ .Release.Name }}-flower
+  name: {{ .Release.Name }}-flower
 spec:
   replicas: 1
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: flower
+        io.kompose.service: {{ .Release.Name }}-flower
     spec:
       containers:
       - name: flower

diff --git a/helm/templates/flower-service.yaml b/helm/templates/flower-service.yaml
@@ -1,19 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose convert --file=compose.yml --chart
-    kompose.version: 1.13.0 (84fa826)
   creationTimestamp: null
   labels:
-    io.kompose.service: flower
-  name: flower
+    io.kompose.service: {{ .Release.Name }}-flower
+  name: {{ .Release.Name }}-flower
 spec:
   ports:
   - name: "8080"
     port: 8080
     targetPort: 8080
   selector:
-    io.kompose.service: flower
+    io.kompose.service: {{ .Release.Name }}-flower
 status:
   loadBalancer: {}
diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: ingress
+  name: {{ .Release.Name }}-ingress
   annotations:
     kubernetes.io/ingress.class: nginx
     kubernetes.io/tls-acme: "true"

diff --git a/helm/templates/nginx-autoscaler.yaml b/helm/templates/nginx-autoscaler.yaml
@@ -2,12 +2,12 @@ apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
   creationTimestamp: null
-  name: nginx
+  name: {{ .Release.Name }}-nginx
 spec:
   maxReplicas: 5
   minReplicas: 3
   scaleTargetRef:
     apiVersion: extensions/v1beta1
     kind: Deployment
-    name: nginx
+    name: {{ .Release.Name }}-nginx
   targetCPUUtilizationPercentage: 75
diff --git a/helm/templates/nginx-deployment.yaml b/helm/templates/nginx-deployment.yaml
@@ -1,21 +1,18 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose convert --file=compose.yml --chart
-    kompose.version: 1.13.0 (84fa826)
   creationTimestamp: null
   labels:
-    io.kompose.service: nginx
-  name: nginx
+    io.kompose.service: {{ .Release.Name }}-nginx
+  name: {{ .Release.Name }}-nginx
 spec:
   replicas: 1
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: nginx
+        io.kompose.service: {{ .Release.Name }}-nginx
     spec:
       containers:
       - name: nginx
@@ -24,17 +21,17 @@ spec:
         - name: DNS_RESOLVER
           value: 127.0.0.1:53 ipv6=off
         - name: HOSTNAME_FLOWER
-          value: flower:8080
+          value: "{{ .Release.Name }}-flower:8080"
         - name: HOSTNAME_CLIENT_METRICS
-          value: api:8080
+          value: "{{ .Release.Name }}-api:8080"
         - name: HOSTNAME_CLIENT_READ
-          value: api:8080
+          value: "{{ .Release.Name }}-api:8080"
         - name: HOSTNAME_CLIENT_WRITE
-          value: api:8080
+          value: "{{ .Release.Name }}-api:8080"
         - name: HOSTNAME_EMAIL_RECEIVE
-          value: api:8080
+          value: "{{ .Release.Name }}-api:8080"
         - name: HOSTNAME_CLIENT_REGISTER
-          value: api:8080
+          value: "{{ .Release.Name }}-api:8080"
         ports:
         - containerPort: 8888
         resources: {}

diff --git a/helm/templates/nginx-service.yaml b/helm/templates/nginx-service.yaml
@@ -1,19 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose convert --file=compose.yml --chart
-    kompose.version: 1.13.0 (84fa826)
   creationTimestamp: null
   labels:
-    io.kompose.service: nginx
-  name: nginx
+    io.kompose.service: {{ .Release.Name }}-nginx
+  name: {{ .Release.Name }}-nginx
 spec:
   ports:
   - name: "8888"
     port: 8888
     targetPort: 8888
   selector:
-    io.kompose.service: nginx
+    io.kompose.service: {{ .Release.Name }}-nginx
 status:
   loadBalancer: {}
diff --git a/helm/templates/worker-autoscaler.yaml b/helm/templates/worker-autoscaler.yaml
@@ -2,12 +2,12 @@ apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
   creationTimestamp: null
-  name: worker
+  name: {{ .Release.Name }}-worker
 spec:
   maxReplicas: 9
   minReplicas: 3
   scaleTargetRef:
     apiVersion: extensions/v1beta1
     kind: Deployment
-    name: worker
+    name: {{ .Release.Name }}-worker
   targetCPUUtilizationPercentage: 75
diff --git a/helm/templates/worker-deployment.yaml b/helm/templates/worker-deployment.yaml
@@ -1,21 +1,18 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose convert --file=compose.yml --chart
-    kompose.version: 1.13.0 (84fa826)
   creationTimestamp: null
   labels:
-    io.kompose.service: worker
-  name: worker
+    io.kompose.service: {{ .Release.Name }}-worker
+  name: {{ .Release.Name }}-worker
 spec:
   replicas: 1
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: worker
+        io.kompose.service: {{ .Release.Name }}-worker
     spec:
       containers:
       - name: worker