Adding a parent contrail chart

Created a new contrail parent chart which imports all other contrail subcharts. By installing this parent contrail chart, it would automatically deploy resources defined in all other sub charts. Below two category of variable has been introduced 1. Global variables like contrail_env which is consumed by all charts 2. Local chart variables like lables, which are very specific to individual charts Change-Id: I9a437ec78de92200cdf1196c5f8e4bf44ded4a02 Partial-Bug: #1749018
Juniper · Mar 20, 2018 · 0fc906c · 0fc906c
1 parent 35bd133
commit 0fc906c
Show file tree

Hide file tree

Showing 34 changed files with 494 additions and 349 deletions.
diff --git a/contrail-analytics/Chart.yaml b/contrail-analytics/Chart.yaml
@@ -3,7 +3,7 @@ name: contrail-analytics
 description: Helm chart for Contrail Analytics
 version: 0.1.0
 appVersion: Contrail 5.0.0
-home: https://github.com/Juniper/contrail-docker/
+home: https://github.com/Juniper/contrail-helm-deployer/
 sources:
   - https://github.com/Juniper/contrail-controller/
 tillerVersion: ">=2.4.0"

diff --git a/contrail-analytics/templates/configmap-env.yaml b/contrail-analytics/templates/configmap-env.yaml
@@ -1,22 +1,25 @@
-{{- if .Values.manifests.configmap_env }}
 {{- $context := . }}
 {{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 {{- $rabbitmq_host := tuple "rabbitmq" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 
+{{- if .Values.manifests.configmap_analytics_env }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-analytics
+  name: contrail-analytics-env
 data:
-  {{- range $key, $value := .Values.contrail_env }}
+  {{- range $key, $value := .Values.global.contrail_env }}
   {{ $key }}: {{ $value | quote }}
   {{- end }}
+{{- end }}
+
+{{- if .Values.manifests.configmap_analytics_keystone }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-analytics-auth
+  name: contrail-analytics-keystone
 data:
   KEYSTONE_AUTH_ADMIN_USER: {{ .Values.endpoints.keystone.auth.username }}
   KEYSTONE_AUTH_ADMIN_TENANT: {{ .Values.endpoints.keystone.auth.project_name }}
@@ -29,16 +32,19 @@ data:
   KEYSTONE_AUTH_ADMIN_PORT: {{ .Values.endpoints.keystone.port.admin.default | quote }}
   KEYSTONE_AUTH_PUBLIC_PORT: {{ .Values.endpoints.keystone.port.api.default | quote }}
   KEYSTONE_AUTH_REGION_NAME: {{ .Values.endpoints.keystone.auth.region_name | quote }}
+{{- end }}
+
+{{- if .Values.manifests.configmap_analytics_rabbitmq }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-analytics-rabbitmq
+  name: contrail-analytics-rabbitmq
 data:
   RABBITMQ_NODES: {{ $rabbitmq_host }}
   RABBITMQ_PORT: {{ .Values.endpoints.rabbitmq.port.amqp.default | quote }}
   RABBITMQ_USER: {{ .Values.endpoints.rabbitmq.auth.username | quote }}
   RABBITMQ_PASSWORD: {{ .Values.endpoints.rabbitmq.auth.password | quote }}
-  RABBITMQ_USE_SSL: {{ .Values.contrail_env.RABBITMQ_USE_SSL | default "false" | quote }}
+  RABBITMQ_USE_SSL: {{ .Values.global.contrail_env.RABBITMQ_USE_SSL | default "false" | quote }}
   RABBITMQ_VHOST: {{ .Values.endpoints.rabbitmq.path | default "/" | quote }}
 {{- end }}
diff --git a/contrail-analytics/templates/daemonset-analytics.yaml b/contrail-analytics/templates/daemonset-analytics.yaml
@@ -1,3 +1,4 @@
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- if .Values.manifests.daemonset_analytics }}
 {{- $context := . }}
 ---
@@ -30,18 +31,18 @@ spec:
 {{ tuple $context .Values.dependencies.analytics nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: contrail-analytics-api
-        image: {{ .Values.images.tags.analytics_api | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.analytics_api | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         ports:
         - name: api-port
-          containerPort: {{ .Values.contrail_env.ANALYTICS_API_PORT | default 8081 }}
+          containerPort: {{ .Values.global.contrail_env.ANALYTICS_API_PORT | default 8081 }}
         - name: introspect-port
-          containerPort: {{ .Values.contrail_env.ANALYTICS_API_INTROSPECT_PORT | default 8090 }}
+          containerPort: {{ .Values.global.contrail_env.ANALYTICS_API_INTROSPECT_PORT | default 8090 }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -50,15 +51,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-collector
-        image: {{ .Values.images.tags.contrail_collector | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.contrail_collector | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         - configMapRef:
-            name: configmap-analytics-rabbitmq
+            name: contrail-analytics-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -67,15 +68,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-alarm-gen
-        image: {{ .Values.images.tags.analytics_alarm_gen | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.analytics_alarm_gen | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         - configMapRef:
-            name: configmap-analytics-rabbitmq
+            name: contrail-analytics-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -84,13 +85,13 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-query-engine
-        image: {{ .Values.images.tags.analytics_query_engine | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.analytics_query_engine | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -99,15 +100,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-snmp-collector
-        image: {{ .Values.images.tags.analytics_snmp_collector | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.analytics_snmp_collector | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         - configMapRef:
-            name: configmap-analytics-rabbitmq
+            name: contrail-analytics-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -116,15 +117,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-topology
-        image: {{ .Values.images.tags.contrail_topology | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.contrail_topology | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         - configMapRef:
-            name: configmap-analytics-rabbitmq
+            name: contrail-analytics-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -133,13 +134,13 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-analytics-nodemgr
-        image: {{ .Values.images.tags.nodemgr | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.nodemgr | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         env:
         - name: NODE_TYPE
           value: analytics

diff --git a/contrail-analytics/templates/service-analytics-api.yaml b/contrail-analytics/templates/service-analytics-api.yaml
@@ -8,10 +8,10 @@ spec:
   ports:
   - name: api
     port: {{ .Values.service.analytics_api_public_port | default 8081 }}
-    targetPort: {{ .Values.contrail_env.ANALYTICS_API_PORT | default 8081 }}
+    targetPort: {{ .Values.global.contrail_env.ANALYTICS_API_PORT | default 8081 }}
   - name: introspect
     port: {{ .Values.service.analytics_introspect_public_port | default 8090 }}
-    targetPort: {{ .Values.contrail_env.ANALYTICS_API_INTROSPECT_PORT | default 8090 }}
+    targetPort: {{ .Values.global.contrail_env.ANALYTICS_API_INTROSPECT_PORT | default 8090 }}
   selector:
 {{ tuple $context "opencontrail" "contrail-analytics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   type: ClusterIP

diff --git a/contrail-analytics/values.yaml b/contrail-analytics/values.yaml
@@ -1,14 +1,21 @@
-images:
-  tags:
-    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
-    analytics_api: "docker.io/opencontrailnightly/contrail-analytics-api:ocata-master-17"
-    contrail_collector: "docker.io/opencontrailnightly/contrail-analytics-collector:ocata-master-17"
-    analytics_alarm_gen: "docker.io/opencontrailnightly/contrail-analytics-alarm-gen:ocata-master-17"
-    analytics_query_engine: "docker.io/opencontrailnightly/contrail-analytics-query-engine:ocata-master-17"
-    analytics_snmp_collector: "docker.io/opencontrailnightly/contrail-analytics-snmp-collector:ocata-master-17"
-    contrail_topology: "docker.io/opencontrailnightly/contrail-analytics-topology:ocata-master-17"
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-  imagePullPolicy: "IfNotPresent"
+global:
+  images:
+    tags:
+      nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
+      analytics_api: "docker.io/opencontrailnightly/contrail-analytics-api:ocata-master-17"
+      contrail_collector: "docker.io/opencontrailnightly/contrail-analytics-collector:ocata-master-17"
+      analytics_alarm_gen: "docker.io/opencontrailnightly/contrail-analytics-alarm-gen:ocata-master-17"
+      analytics_query_engine: "docker.io/opencontrailnightly/contrail-analytics-query-engine:ocata-master-17"
+      analytics_snmp_collector: "docker.io/opencontrailnightly/contrail-analytics-snmp-collector:ocata-master-17"
+      contrail_topology: "docker.io/opencontrailnightly/contrail-analytics-topology:ocata-master-17"
+      dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+    imagePullPolicy: "IfNotPresent"
+
+  contrail_env:
+    CONTROLLER_NODES: 10.87.65.248
+    LOG_LEVEL: SYS_NOTICE
+    CLOUD_ORCHESTRATOR: openstack
+    AAA_MODE: cloud-admin
 
 labels:
   analytics:
@@ -22,12 +29,6 @@ dependencies:
     - contrail-analyticsdb
     - contrail-config
 
-contrail_env:
-  CONTROLLER_NODES: 10.87.65.248
-  LOG_LEVEL: SYS_NOTICE
-  CLOUD_ORCHESTRATOR: openstack
-  AAA_MODE: cloud-admin
-
 # typically overriden by environmental
 # values, but should include all endpoints
 # required by this chart
@@ -76,7 +77,9 @@ service:
   analytics_api_public_port: ""
 
 manifests:
-  configmap_env: true
+  configmap_analytics_env: true
+  configmap_analytics_keystone: true
+  configmap_analytics_rabbitmq: true
   daemonset_analytics: true
   service_analytics_api_server: true
   service_analytics_api_ingress: true

diff --git a/contrail-controller/Chart.yaml b/contrail-controller/Chart.yaml
@@ -3,7 +3,7 @@ name: contrail-controller
 description: Helm chart for Contrail controller
 version: 0.1.0
 appVersion: Contrail 5.0.0
-home: https://github.com/Juniper/contrail-docker/
+home: https://github.com/Juniper/contrail-helm-deployer/
 sources:
   - https://github.com/Juniper/contrail-controller/
 tillerVersion: ">=2.4.0"

diff --git a/contrail-controller/templates/configmap-env.yaml b/contrail-controller/templates/configmap-env.yaml
@@ -1,26 +1,28 @@
-{{- if .Values.manifests.configmap_env }}
 {{- $context := . }}
 {{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 {{- $rabbitmq_host := tuple "rabbitmq" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 {{- $metadata_host := tuple "nova_metadata" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 
+{{- if .Values.manifests.configmap_controller_env }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-controller
+  name: contrail-controller-env
 data:
-  {{- range $key, $value := .Values.contrail_env }}
+  {{- range $key, $value := .Values.global.contrail_env }}
   {{ $key }}: {{ $value | quote }}
   {{- end }}
   IPFABRIC_SERVICE_HOST: {{ $metadata_host }}
   IPFABRIC_SERVICE_PORT: {{ .Values.endpoints.nova_metadata.port.metadata.public | quote }}
+{{- end }}
 
+{{- if .Values.manifests.configmap_controller_keystone }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-controller-auth
+  name: contrail-controller-keystone
 data:
   KEYSTONE_AUTH_ADMIN_USER: {{ .Values.endpoints.keystone.auth.username }}
   KEYSTONE_AUTH_ADMIN_TENANT: {{ .Values.endpoints.keystone.auth.project_name }}
@@ -34,17 +36,19 @@ data:
   KEYSTONE_AUTH_PUBLIC_PORT: {{ .Values.endpoints.keystone.port.api.default | quote }}
   KEYSTONE_AUTH_REGION_NAME: {{ .Values.endpoints.keystone.auth.region_name | quote }}
   identityManager_apiVersion: '["v3"]'
+{{- end }}
+
+{{- if .Values.manifests.configmap_controller_rabbitmq }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-controller-rabbitmq
+  name: contrail-controller-rabbitmq
 data:
   RABBITMQ_NODES: {{ $rabbitmq_host }}
   RABBITMQ_PORT: {{ .Values.endpoints.rabbitmq.port.amqp.default | quote }}
   RABBITMQ_USER: {{ .Values.endpoints.rabbitmq.auth.username | quote }}
   RABBITMQ_PASSWORD: {{ .Values.endpoints.rabbitmq.auth.password | quote }}
-  RABBITMQ_USE_SSL: {{ .Values.contrail_env.RABBITMQ_USE_SSL | default "false" | quote }}
+  RABBITMQ_USE_SSL: {{ .Values.global.contrail_env.RABBITMQ_USE_SSL | default "false" | quote }}
   RABBITMQ_VHOST: {{ .Values.endpoints.rabbitmq.path | default "/" | quote }}
-
 {{- end }}