From 8223d0671617ee6dcc68307aefd3634e1bb0ac8d Mon Sep 17 00:00:00 2001 From: Rajamohan Raj Date: Thu, 9 Jul 2020 20:51:34 +0000 Subject: Fixing the triple dash issue in YAML. In this patch, identified the root cause of failure due to triple dash and fixed it. Also reverted back to original helm charts for M3db operator. Issue-ID: MULTICLOUD-1114 Signed-off-by: Rajamohan Raj Change-Id: I175cd134cc751bf4b59e72c9c79e0e658a62f348 --- kud/tests/m3db-operator-test.sh | 8 +++++-- .../etcd-operator/templates/etcd-cluster-crd.yaml | 26 ++++++++++++++++++++++ .../templates/etcd-cluster-creation.yaml | 23 ------------------- .../helm/operator/charts/etcd-operator/values.yaml | 2 +- 4 files changed, 33 insertions(+), 26 deletions(-) delete mode 100644 kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-creation.yaml (limited to 'kud') diff --git a/kud/tests/m3db-operator-test.sh b/kud/tests/m3db-operator-test.sh index 5642fb69..1962c3f3 100755 --- a/kud/tests/m3db-operator-test.sh +++ b/kud/tests/m3db-operator-test.sh @@ -25,11 +25,15 @@ source _common_test.sh source _functions.sh source _common.sh +# base_url_orchestrator=${base_url_orchestrator:-"http://localhost:9015/v2"} +# base_url_clm=${base_url_clm:-"http://localhost:9019/v2"} +# base_url_ncm=${base_url_ncm:-"http://localhost:9016/v2"} +base_url_orchestrator=${base_url_orchestrator:-"http://192.168.121.29:30356/v2"} base_url_clm=${base_url_clm:-"http://192.168.121.29:32551/v2"} base_url_ncm=${base_url_ncm:-"http://192.168.121.29:31406/v2"} -base_url_orchestrator=${base_url_orchestrator:-"http://192.168.121.29:30356/v2"} -base_url_rysnc=${base_url_orchestrator:-"http://192.168.121.29:31751/v2"} +base_url_rysnc=${base_url_rysnc:-"http://192.168.121.29:31751/v2"} + CSAR_DIR="/opt/csar" csar_id="operators-cb009bfe-bbee-11e8-9766-525400435678" diff --git a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml b/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml index 8c42b26f..2cccb2b2 100644 --- a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml +++ b/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml @@ -1,4 +1,6 @@ {{- if .Values.deployments.etcdOperator }} +# Synced with https://github.com/coreos/etcd-operator/blob/master/pkg/util/k8sutil/crd.go +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -23,3 +25,27 @@ spec: shortNames: - etcd {{- end }} +{{- if .Values.customResources.createEtcdClusterCRD }} +--- +apiVersion: "etcd.database.coreos.com/v1beta2" +kind: "EtcdCluster" +metadata: + name: {{ .Values.etcdCluster.name }} + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: {{ template "etcd-operator.name" . }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} + annotations: + "helm.sh/hook": "post-install" + "helm.sh/hook-delete-policy": "before-hook-creation" +spec: + size: {{ .Values.etcdCluster.size }} + version: "{{ .Values.etcdCluster.version }}" + pod: +{{ toYaml .Values.etcdCluster.pod | indent 4 }} + {{- if .Values.etcdCluster.enableTLS }} + TLS: +{{ toYaml .Values.etcdCluster.tls | indent 4 }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-creation.yaml b/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-creation.yaml deleted file mode 100644 index 471bfac0..00000000 --- a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-creation.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if .Values.customResources.createEtcdClusterCRD }} -apiVersion: "etcd.database.coreos.com/v1beta2" -kind: "EtcdCluster" -metadata: - name: {{ .Values.etcdCluster.name }} - labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - app: {{ template "etcd-operator.name" . }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} - annotations: - "helm.sh/hook": "post-install" - "helm.sh/hook-delete-policy": "before-hook-creation" -spec: - size: {{ .Values.etcdCluster.size }} - version: "{{ .Values.etcdCluster.version }}" - pod: -{{ toYaml .Values.etcdCluster.pod | indent 4 }} - {{- if .Values.etcdCluster.enableTLS }} - TLS: -{{ toYaml .Values.etcdCluster.tls | indent 4 }} - {{- end }} -{{- end }} diff --git a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/values.yaml b/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/values.yaml index e698f338..90947807 100644 --- a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/values.yaml +++ b/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/values.yaml @@ -37,7 +37,7 @@ deployments: # you could use `helm template --values --name release_name ... ` # and create the resources yourself to deploy on your cluster later customResources: - createEtcdClusterCRD: false + createEtcdClusterCRD: true createBackupCRD: false createRestoreCRD: false -- cgit 1.2.3-korg