diff options
5 files changed, 38 insertions, 26 deletions
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 <values.yaml> --name release_name ... ` # and create the resources yourself to deploy on your cluster later customResources: - createEtcdClusterCRD: false + createEtcdClusterCRD: true createBackupCRD: false createRestoreCRD: false diff --git a/src/orchestrator/pkg/module/instantiation_appcontext_helper.go b/src/orchestrator/pkg/module/instantiation_appcontext_helper.go index e6e2bf30..1cb3f23d 100644 --- a/src/orchestrator/pkg/module/instantiation_appcontext_helper.go +++ b/src/orchestrator/pkg/module/instantiation_appcontext_helper.go @@ -86,6 +86,11 @@ func getResources(st []helm.KubernetesResourceTemplate) ([]resource, error) { return nil, pkgerrors.Wrap(err, "Failed to get the resources..") } n := yamlStruct.Metadata.Name + SEPARATOR + yamlStruct.Kind + // This might happen when the rendered file just has some comments inside, no real k8s object. + if n == SEPARATOR { + log.Info(":: Ignoring, Unable to render the template ::", log.Fields{"YAML PATH": t.FilePath}) + continue; + } resources = append(resources, resource{name: n, filecontent: string(yamlFile)}) |