From cf9c85363249c5ecfd161acf8a9e5b9ef98bb34a Mon Sep 17 00:00:00 2001 From: Madhukar Nayakbomman Date: Fri, 23 Feb 2018 15:35:47 -0800 Subject: [PATCH] Removing each_container_is_pod option Through this commit we will only support option of deploying multiple containers into single pod. After this commit each_container_is_pod is no longer supported Change-Id: Ia57f2c49d25e1128ad9a23a4547d67c73a1de1bb Partial-Bug: #1749018 --- .../templates/daemonset-alarm-gen.yaml | 54 --------------- .../templates/daemonset-analytics-api.yaml | 52 -------------- .../daemonset-analytics-collector.yaml | 54 --------------- .../daemonset-analytics-nodemgr.yaml | 67 ------------------- .../templates/daemonset-analytics.yaml | 2 - .../templates/daemonset-query-engine.yaml | 52 -------------- .../templates/daemonset-snmp-collector.yaml | 54 --------------- .../templates/daemonset-topology.yaml | 54 --------------- contrail-analytics/values.yaml | 38 +---------- .../templates/daemonset-config-api.yaml | 54 --------------- .../templates/daemonset-config-nodemgr.yaml | 62 ----------------- .../templates/daemonset-config.yaml | 6 +- .../templates/daemonset-control-nodemgr.yaml | 67 ------------------- .../templates/daemonset-control-only.yaml | 12 ++-- .../templates/daemonset-control.yaml | 6 +- .../templates/daemonset-devicemgr.yaml | 54 --------------- .../templates/daemonset-dns.yaml | 54 --------------- .../templates/daemonset-named.yaml | 56 ---------------- .../daemonset-schema-transformer.yaml | 54 --------------- .../templates/daemonset-svcmonitor.yaml | 54 --------------- .../templates/daemonset-web.yaml | 67 ------------------- .../templates/daemonset-webui-middleware.yaml | 52 -------------- .../templates/daemonset-webui.yaml | 15 ++++- contrail-controller/values.yaml | 60 ++--------------- 24 files changed, 29 insertions(+), 1071 deletions(-) delete mode 100644 contrail-analytics/templates/daemonset-alarm-gen.yaml delete mode 100644 contrail-analytics/templates/daemonset-analytics-api.yaml delete mode 100644 contrail-analytics/templates/daemonset-analytics-collector.yaml delete mode 100644 contrail-analytics/templates/daemonset-analytics-nodemgr.yaml delete mode 100644 contrail-analytics/templates/daemonset-query-engine.yaml delete mode 100644 contrail-analytics/templates/daemonset-snmp-collector.yaml delete mode 100644 contrail-analytics/templates/daemonset-topology.yaml delete mode 100644 contrail-controller/templates/daemonset-config-api.yaml delete mode 100644 contrail-controller/templates/daemonset-config-nodemgr.yaml delete mode 100644 contrail-controller/templates/daemonset-control-nodemgr.yaml delete mode 100644 contrail-controller/templates/daemonset-devicemgr.yaml delete mode 100644 contrail-controller/templates/daemonset-dns.yaml delete mode 100644 contrail-controller/templates/daemonset-named.yaml delete mode 100644 contrail-controller/templates/daemonset-schema-transformer.yaml delete mode 100644 contrail-controller/templates/daemonset-svcmonitor.yaml delete mode 100644 contrail-controller/templates/daemonset-web.yaml delete mode 100644 contrail-controller/templates/daemonset-webui-middleware.yaml diff --git a/contrail-analytics/templates/daemonset-alarm-gen.yaml b/contrail-analytics/templates/daemonset-alarm-gen.yaml deleted file mode 100644 index f045870..0000000 --- a/contrail-analytics/templates/daemonset-alarm-gen.yaml +++ /dev/null @@ -1,54 +0,0 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_analytics }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-alarm-gen -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-alarm-gen" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.alarm_gen.node_selector_key }} - operator: In - values: - - {{ .Values.labels.alarm_gen.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.alarm_gen nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-alarm-gen - image: {{ .Values.images.tags.analytics_alarm_gen | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-analytics - - configMapRef: - name: configmap-analytics-auth - - configMapRef: - name: configmap-analytics-rabbitmq - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/analytics/ - - name: contrail-log - hostPath: - path: /var/log/contrail/analytics/ -{{- end }} diff --git a/contrail-analytics/templates/daemonset-analytics-api.yaml b/contrail-analytics/templates/daemonset-analytics-api.yaml deleted file mode 100644 index f7d8f26..0000000 --- a/contrail-analytics/templates/daemonset-analytics-api.yaml +++ /dev/null @@ -1,52 +0,0 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_analytics }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-analytics -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-analytics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.analytics_api.node_selector_key }} - operator: In - values: - - {{ .Values.labels.analytics_api.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ 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 }} - envFrom: - - configMapRef: - name: configmap-analytics - - configMapRef: - name: configmap-analytics-auth - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/analytics/ - - name: contrail-log - hostPath: - path: /var/log/contrail/analytics/ -{{- end }} diff --git a/contrail-analytics/templates/daemonset-analytics-collector.yaml b/contrail-analytics/templates/daemonset-analytics-collector.yaml deleted file mode 100644 index e69b931..0000000 --- a/contrail-analytics/templates/daemonset-analytics-collector.yaml +++ /dev/null @@ -1,54 +0,0 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_analytics }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-collector -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-collector" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.contrail_collector.node_selector_key }} - operator: In - values: - - {{ .Values.labels.contrail_collector.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.contrail_collector nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-collector - image: {{ .Values.images.tags.contrail_collector | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-analytics - - configMapRef: - name: configmap-analytics-auth - - configMapRef: - name: configmap-analytics-rabbitmq - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/analytics/ - - name: contrail-log - hostPath: - path: /var/log/contrail/analytics/ -{{- end }} diff --git a/contrail-analytics/templates/daemonset-analytics-nodemgr.yaml b/contrail-analytics/templates/daemonset-analytics-nodemgr.yaml deleted file mode 100644 index a140b8f..0000000 --- a/contrail-analytics/templates/daemonset-analytics-nodemgr.yaml +++ /dev/null @@ -1,67 +0,0 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_analytics }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-analytics-nodemgr -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-analytics-nodemgr" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.analytics_nodemgr.node_selector_key }} - operator: In - values: - - {{ .Values.labels.analytics_nodemgr.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.analytics_nodemgr nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-analytics-nodemgr - image: {{ .Values.images.tags.nodemgr | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-analytics - - configMapRef: - name: configmap-analytics-auth - env: - - name: NODE_TYPE - value: analytics - - name: DOCKER_HOST - value: "unix://mnt/docker.sock" -# todo: there is type Socket in new kubernetes, it is possible to use full -# path: -# hostPath: -# path: /var/run/docker.sock and -# type: Socket - volumeMounts: - - mountPath: /mnt - name: docker-unix-socket - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: docker-unix-socket - hostPath: - path: /var/run - - name: etc-contrail - hostPath: - path: /etc/contrail/analytics/ - - name: contrail-log - hostPath: - path: /var/log/contrail/analytics/ -{{- end }} diff --git a/contrail-analytics/templates/daemonset-analytics.yaml b/contrail-analytics/templates/daemonset-analytics.yaml index c41b71e..7ef393f 100644 --- a/contrail-analytics/templates/daemonset-analytics.yaml +++ b/contrail-analytics/templates/daemonset-analytics.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.manifests.each_container_is_pod }} {{- if .Values.manifests.daemonset_analytics }} {{- $context := . }} --- @@ -154,4 +153,3 @@ spec: path: /var/log/contrail/analytics/ {{- end }} -{{- end }} diff --git a/contrail-analytics/templates/daemonset-query-engine.yaml b/contrail-analytics/templates/daemonset-query-engine.yaml deleted file mode 100644 index 9e4ee7f..0000000 --- a/contrail-analytics/templates/daemonset-query-engine.yaml +++ /dev/null @@ -1,52 +0,0 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_analytics }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-query-engine -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-query-engine" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.query_engine.node_selector_key }} - operator: In - values: - - {{ .Values.labels.query_engine.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.query_engine nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-query-engine - image: {{ .Values.images.tags.analytics_query_engine | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-analytics - - configMapRef: - name: configmap-analytics-auth - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/analytics/ - - name: contrail-log - hostPath: - path: /var/log/contrail/analytics/ -{{- end }} diff --git a/contrail-analytics/templates/daemonset-snmp-collector.yaml b/contrail-analytics/templates/daemonset-snmp-collector.yaml deleted file mode 100644 index 081b6d1..0000000 --- a/contrail-analytics/templates/daemonset-snmp-collector.yaml +++ /dev/null @@ -1,54 +0,0 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_analytics }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-snmp-collector -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-snmp-collector" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.snmp_collector.node_selector_key }} - operator: In - values: - - {{ .Values.labels.snmp_collector.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.snmp_collector nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-snmp-collector - image: {{ .Values.images.tags.analytics_snmp_collector | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-analytics - - configMapRef: - name: configmap-analytics-auth - - configMapRef: - name: configmap-analytics-rabbitmq - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/analytics/ - - name: contrail-log - hostPath: - path: /var/log/contrail/analytics/ -{{- end }} diff --git a/contrail-analytics/templates/daemonset-topology.yaml b/contrail-analytics/templates/daemonset-topology.yaml deleted file mode 100644 index f64def9..0000000 --- a/contrail-analytics/templates/daemonset-topology.yaml +++ /dev/null @@ -1,54 +0,0 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_analytics }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-topology -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-topology" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.contrail_topology.node_selector_key }} - operator: In - values: - - {{ .Values.labels.contrail_topology.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.contrail_topology nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-topology - image: {{ .Values.images.tags.contrail_topology | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-analytics - - configMapRef: - name: configmap-analytics-auth - - configMapRef: - name: configmap-analytics-rabbitmq - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/analytics/ - - name: contrail-log - hostPath: - path: /var/log/contrail/analytics/ -{{- end }} diff --git a/contrail-analytics/values.yaml b/contrail-analytics/values.yaml index 7965e37..68a6663 100644 --- a/contrail-analytics/values.yaml +++ b/contrail-analytics/values.yaml @@ -14,48 +14,13 @@ labels: analytics: node_selector_key: opencontrail.org/controller node_selector_value: "enabled" - alarm_gen: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - analytics_api: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - contrail_collector: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - analytics_nodemgr: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - query_engine: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - snmp_collector: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - contrail_topology: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" dependencies: analytics: daemonset: - contrail-analyticsdb - contrail_collector: - daemonset: - - contrail-analytics - alarm_gen: - daemonset: - - contrail-analytics - query_engine: - daemonset: - - contrail-analytics - snmp_collector: - daemonset: - - contrail-analytics - contrail_topology: - daemonset: - - contrail-analytics + - contrail-config contrail_env: CONTROLLER_NODES: 10.87.65.248 @@ -105,6 +70,5 @@ endpoints: default: null manifests: - each_container_is_pod: true configmap_env: true daemonset_analytics: true diff --git a/contrail-controller/templates/daemonset-config-api.yaml b/contrail-controller/templates/daemonset-config-api.yaml deleted file mode 100644 index 7122244..0000000 --- a/contrail-controller/templates/daemonset-config-api.yaml +++ /dev/null @@ -1,54 +0,0 @@ -{{- if and .Values.manifests.daemonset_config .Values.manifests.each_container_is_pod }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-config -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-config-api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.config_api.node_selector_key }} - operator: In - values: - - {{ .Values.labels.config_api.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.config nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-config-api - image: {{ .Values.images.tags.config_api | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-controller - - configMapRef: - name: configmap-controller-auth - - configMapRef: - name: configmap-controller-rabbitmq - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/config/ - - name: contrail-log - hostPath: - path: /var/log/contrail/config/ -{{- end }} diff --git a/contrail-controller/templates/daemonset-config-nodemgr.yaml b/contrail-controller/templates/daemonset-config-nodemgr.yaml deleted file mode 100644 index 93a135b..0000000 --- a/contrail-controller/templates/daemonset-config-nodemgr.yaml +++ /dev/null @@ -1,62 +0,0 @@ -{{- if and .Values.manifests.daemonset_config .Values.manifests.each_container_is_pod }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-config-nodemgr -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-config-nodemgr" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.config_nodemgr.node_selector_key }} - operator: In - values: - - {{ .Values.labels.config_nodemgr.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.config_nodemgr nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-config-nodemgr - image: {{ .Values.images.tags.nodemgr | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-controller - - configMapRef: - name: configmap-controller-auth - env: - - name: NODE_TYPE - value: config - - name: DOCKER_HOST - value: "unix://mnt/docker.sock" - volumeMounts: - - mountPath: /mnt - name: docker-unix-socket - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: docker-unix-socket - hostPath: - path: /var/run - - name: etc-contrail - hostPath: - path: /etc/contrail/config/ - - name: contrail-log - hostPath: - path: /var/log/contrail/config/ -{{- end }} diff --git a/contrail-controller/templates/daemonset-config.yaml b/contrail-controller/templates/daemonset-config.yaml index c6e3299..c5cca26 100644 --- a/contrail-controller/templates/daemonset-config.yaml +++ b/contrail-controller/templates/daemonset-config.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.manifests.each_container_is_pod }} {{- if .Values.manifests.daemonset_config }} {{- $context := . }} --- @@ -17,10 +16,10 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: {{ .Values.labels.controller.node_selector_key }} + - key: {{ .Values.labels.config.node_selector_key }} operator: In values: - - {{ .Values.labels.controller.node_selector_value }} + - {{ .Values.labels.config.node_selector_value }} tolerations: - key: node-role.kubernetes.io/master operator: Exists @@ -126,4 +125,3 @@ spec: hostPath: path: /var/log/contrail/config/ {{- end }} -{{- end }} diff --git a/contrail-controller/templates/daemonset-control-nodemgr.yaml b/contrail-controller/templates/daemonset-control-nodemgr.yaml deleted file mode 100644 index c9eabe2..0000000 --- a/contrail-controller/templates/daemonset-control-nodemgr.yaml +++ /dev/null @@ -1,67 +0,0 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_control }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-control-nodemgr -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-nodemgr" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.control_nodemgr.node_selector_key }} - operator: In - values: - - {{ .Values.labels.control_nodemgr.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.control_nodemgr nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-control-nodemgr - image: {{ .Values.images.tags.nodemgr | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-controller - - configMapRef: - name: configmap-controller-auth - env: - - name: NODE_TYPE - value: control - - name: DOCKER_HOST - value: "unix://mnt/docker.sock" -# todo: there is type Socket in new kubernetes, it is possible to use full -# path: -# hostPath: -# path: /var/run/docker.sock and -# type: Socket - volumeMounts: - - mountPath: /mnt - name: docker-unix-socket - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: docker-unix-socket - hostPath: - path: /var/run - - name: etc-contrail - hostPath: - path: /etc/contrail/control/ - - name: contrail-log - hostPath: - path: /var/log/contrail/control/ -{{- end }} diff --git a/contrail-controller/templates/daemonset-control-only.yaml b/contrail-controller/templates/daemonset-control-only.yaml index 86928a0..98fd8a3 100644 --- a/contrail-controller/templates/daemonset-control-only.yaml +++ b/contrail-controller/templates/daemonset-control-only.yaml @@ -1,25 +1,25 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_control }} +{{- if .Values.manifests.daemonset_control_only }} {{- $context := . }} --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: - name: contrail-control + name: contrail-control-only spec: template: metadata: labels: -{{ tuple $context "opencontrail" "contrail-control" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} +{{ tuple $context "opencontrail" "contrail-control-only" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: {{ .Values.labels.contrail_control.node_selector_key }} + - key: {{ .Values.labels.control_only.node_selector_key }} operator: In values: - - {{ .Values.labels.contrail_control.node_selector_value }} + - {{ .Values.labels.control_only.node_selector_value }} tolerations: - key: node-role.kubernetes.io/master operator: Exists @@ -27,7 +27,7 @@ spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet initContainers: -{{ tuple $context .Values.dependencies.control nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} +{{ tuple $context .Values.dependencies.control_only nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: contrail-control image: {{ .Values.images.tags.contrail_control | quote }} diff --git a/contrail-controller/templates/daemonset-control.yaml b/contrail-controller/templates/daemonset-control.yaml index 26d898d..d46432e 100644 --- a/contrail-controller/templates/daemonset-control.yaml +++ b/contrail-controller/templates/daemonset-control.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.manifests.each_container_is_pod }} {{- if .Values.manifests.daemonset_control }} {{- $context := . }} --- @@ -17,10 +16,10 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: {{ .Values.labels.controller.node_selector_key }} + - key: {{ .Values.labels.control.node_selector_key }} operator: In values: - - {{ .Values.labels.controller.node_selector_value }} + - {{ .Values.labels.control.node_selector_value }} tolerations: - key: node-role.kubernetes.io/master operator: Exists @@ -113,4 +112,3 @@ spec: hostPath: path: /var/log/contrail/control/ {{- end }} -{{- end }} diff --git a/contrail-controller/templates/daemonset-devicemgr.yaml b/contrail-controller/templates/daemonset-devicemgr.yaml deleted file mode 100644 index 19150ed..0000000 --- a/contrail-controller/templates/daemonset-devicemgr.yaml +++ /dev/null @@ -1,54 +0,0 @@ -{{- if and .Values.manifests.daemonset_config .Values.manifests.each_container_is_pod }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-devicemgr -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-devicemgr" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.config_devicemgr.node_selector_key }} - operator: In - values: - - {{ .Values.labels.config_devicemgr.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.devicemgr nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-devicemgr - image: {{ .Values.images.tags.config_devicemgr | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-controller - - configMapRef: - name: configmap-controller-auth - - configMapRef: - name: configmap-controller-rabbitmq - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/config/ - - name: contrail-log - hostPath: - path: /var/log/contrail/config/ -{{- end }} diff --git a/contrail-controller/templates/daemonset-dns.yaml b/contrail-controller/templates/daemonset-dns.yaml deleted file mode 100644 index 04cd71e..0000000 --- a/contrail-controller/templates/daemonset-dns.yaml +++ /dev/null @@ -1,54 +0,0 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_control }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-dns -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-dns" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.control_dns.node_selector_key }} - operator: In - values: - - {{ .Values.labels.control_dns.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.contrail_dns nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-dns - image: {{ .Values.images.tags.control_dns | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-controller - - configMapRef: - name: configmap-controller-auth - - configMapRef: - name: configmap-controller-rabbitmq - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/control/ - - name: contrail-log - hostPath: - path: /var/log/contrail/control/ -{{- end }} diff --git a/contrail-controller/templates/daemonset-named.yaml b/contrail-controller/templates/daemonset-named.yaml deleted file mode 100644 index 1aef22a..0000000 --- a/contrail-controller/templates/daemonset-named.yaml +++ /dev/null @@ -1,56 +0,0 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_control }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-named -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-named" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.control_named.node_selector_key }} - operator: In - values: - - {{ .Values.labels.control_named.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.contrail_named nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-named - image: {{ .Values.images.tags.control_named | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - securityContext: - privileged: true - envFrom: - - configMapRef: - name: configmap-controller - - configMapRef: - name: configmap-controller-auth - - configMapRef: - name: configmap-controller-rabbitmq - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/control/ - - name: contrail-log - hostPath: - path: /var/log/contrail/control/ -{{- end }} diff --git a/contrail-controller/templates/daemonset-schema-transformer.yaml b/contrail-controller/templates/daemonset-schema-transformer.yaml deleted file mode 100644 index 3680b6c..0000000 --- a/contrail-controller/templates/daemonset-schema-transformer.yaml +++ /dev/null @@ -1,54 +0,0 @@ -{{- if and .Values.manifests.daemonset_config .Values.manifests.each_container_is_pod }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-schema-transformer -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-schema-transformer" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.schema_transformer.node_selector_key }} - operator: In - values: - - {{ .Values.labels.schema_transformer.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.schema_transformer nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-schema-transformer - image: {{ .Values.images.tags.config_schema_transformer | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-controller - - configMapRef: - name: configmap-controller-auth - - configMapRef: - name: configmap-controller-rabbitmq - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/config/ - - name: contrail-log - hostPath: - path: /var/log/contrail/config/ -{{- end }} diff --git a/contrail-controller/templates/daemonset-svcmonitor.yaml b/contrail-controller/templates/daemonset-svcmonitor.yaml deleted file mode 100644 index 5d0ac3d..0000000 --- a/contrail-controller/templates/daemonset-svcmonitor.yaml +++ /dev/null @@ -1,54 +0,0 @@ -{{- if and .Values.manifests.daemonset_config .Values.manifests.each_container_is_pod }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-svcmonitor -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-svcmonitor" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.svc_monitor.node_selector_key }} - operator: In - values: - - {{ .Values.labels.svc_monitor.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.svcmonitor nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-svc-monitor - image: {{ .Values.images.tags.config_svcmonitor | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-controller - - configMapRef: - name: configmap-controller-auth - - configMapRef: - name: configmap-controller-rabbitmq - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/config/ - - name: contrail-log - hostPath: - path: /var/log/contrail/config/ -{{- end }} diff --git a/contrail-controller/templates/daemonset-web.yaml b/contrail-controller/templates/daemonset-web.yaml deleted file mode 100644 index 307aa50..0000000 --- a/contrail-controller/templates/daemonset-web.yaml +++ /dev/null @@ -1,67 +0,0 @@ -{{- if not .Values.manifests.each_container_is_pod }} -{{- if .Values.manifests.daemonset_webui }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-webui -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-webui" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.controller.node_selector_key }} - operator: In - values: - - {{ .Values.labels.controller.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.webui nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-webui-middleware - image: {{ .Values.images.tags.webui_middleware | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-controller - - configMapRef: - name: configmap-controller-auth - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - - name: contrail-webui - image: {{ .Values.images.tags.webui | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-controller - - configMapRef: - name: configmap-controller-auth - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/webui/ - - name: contrail-log - hostPath: - path: /var/log/contrail/webui/ -{{- end }} -{{- end }} diff --git a/contrail-controller/templates/daemonset-webui-middleware.yaml b/contrail-controller/templates/daemonset-webui-middleware.yaml deleted file mode 100644 index c7a8316..0000000 --- a/contrail-controller/templates/daemonset-webui-middleware.yaml +++ /dev/null @@ -1,52 +0,0 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_webui }} -{{- $context := . }} ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: contrail-webui-middleware -spec: - template: - metadata: - labels: -{{ tuple $context "opencontrail" "contrail-webui-middleware" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: {{ .Values.labels.webui_middleware.node_selector_key }} - operator: In - values: - - {{ .Values.labels.webui_middleware.node_selector_value }} - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - initContainers: -{{ tuple $context .Values.dependencies.webui_middleware nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: contrail-webui-middleware - image: {{ .Values.images.tags.webui_middleware | quote }} - imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} - envFrom: - - configMapRef: - name: configmap-controller - - configMapRef: - name: configmap-controller-auth - volumeMounts: - - mountPath: /var/log/contrail/ - name: contrail-log - - mountPath: /etc/contrail/ - name: etc-contrail - volumes: - - name: etc-contrail - hostPath: - path: /etc/contrail/webui/ - - name: contrail-log - hostPath: - path: /var/log/contrail/webui/ -{{- end }} diff --git a/contrail-controller/templates/daemonset-webui.yaml b/contrail-controller/templates/daemonset-webui.yaml index eca3b99..c8ead67 100644 --- a/contrail-controller/templates/daemonset-webui.yaml +++ b/contrail-controller/templates/daemonset-webui.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.manifests.each_container_is_pod .Values.manifests.daemonset_webui }} +{{- if .Values.manifests.daemonset_webui }} {{- $context := . }} --- apiVersion: extensions/v1beta1 @@ -29,6 +29,19 @@ spec: initContainers: {{ tuple $context .Values.dependencies.webui nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: + - name: contrail-webui-middleware + image: {{ .Values.images.tags.webui_middleware | quote }} + imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} + envFrom: + - configMapRef: + name: configmap-controller + - configMapRef: + name: configmap-controller-auth + volumeMounts: + - mountPath: /var/log/contrail/ + name: contrail-log + - mountPath: /etc/contrail/ + name: etc-contrail - name: contrail-webui image: {{ .Values.images.tags.webui | quote }} imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }} diff --git a/contrail-controller/values.yaml b/contrail-controller/values.yaml index 303eb89..f7fad95 100644 --- a/contrail-controller/values.yaml +++ b/contrail-controller/values.yaml @@ -14,37 +14,13 @@ images: imagePullPolicy: "IfNotPresent" labels: - controller: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - config_api: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - config_devicemgr: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - schema_transformer: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - svc_monitor: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - config_nodemgr: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - contrail_control: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - control_dns: - node_selector_key: opencontrail.org/controller - node_selector_value: "enabled" - control_named: + control: node_selector_key: opencontrail.org/controller node_selector_value: "enabled" - control_nodemgr: + control_only: node_selector_key: opencontrail.org/controller node_selector_value: "enabled" - webui_middleware: + config: node_selector_key: opencontrail.org/controller node_selector_value: "enabled" webui: @@ -55,41 +31,13 @@ dependencies: config: daemonset: - contrail-configdb - schema_transformer: - daemonset: - - contrail-config - svcmonitor: - daemonset: - - contrail-config - devicemgr: - daemonset: - - contrail-config - config_nodemgr: - daemonset: - - contrail-config control: daemonset: - contrail-config - contrail_named: - daemonset: - - contrail-control - - contrail-config - contrail_dns: - daemonset: - - contrail-control - - contrail-config - control_nodemgr: - daemonset: - - contrail-control - - contrail-config webui: daemonset: - contrail-config - contrail-redis - webui_middleware: - daemonset: - - contrail-config - - contrail-webui contrail_env: CONTROLLER_NODES: 10.87.65.248 @@ -140,9 +88,9 @@ endpoints: default: null manifests: - each_container_is_pod: true configmap_env: true daemonset_config: true daemonset_control: true + daemonset_control_only: false daemonset_webui: true daemonset_agent: true