From d85d374649c90b8b5967f984857dbe1af2810a19 Mon Sep 17 00:00:00 2001 From: Madhukar Nayakbomman Date: Mon, 12 Feb 2018 15:53:28 -0800 Subject: [PATCH] Deprecating contrail-helper charts As we are using helm-toolkit from openstack-helm repo, we will remove files and folders related to contrail-helm charts Change-Id: I5f0377bf13e0dc4d0089198a608654d9be70e1de Partial-Bug: #1749018 --- Makefile | 2 +- contrail-analytics/requirements.yaml | 3 -- contrail-controller/requirements.yaml | 3 -- contrail-helper/Chart.yaml | 12 ----- .../templates/_endpoint_host_lookup.tpl | 19 -------- .../_entrypoint_init_container.yaml | 46 ------------------- .../kubernetes_spec/_metadata_label.yaml | 17 ------- contrail-helper/values.yaml | 16 ------- contrail-thirdparty/requirements.yaml | 3 -- contrail-vrouter/requirements.yaml | 3 -- 10 files changed, 1 insertion(+), 123 deletions(-) delete mode 100644 contrail-helper/Chart.yaml delete mode 100644 contrail-helper/templates/_endpoint_host_lookup.tpl delete mode 100644 contrail-helper/templates/kubernetes_spec/_entrypoint_init_container.yaml delete mode 100644 contrail-helper/templates/kubernetes_spec/_metadata_label.yaml delete mode 100644 contrail-helper/values.yaml diff --git a/Makefile b/Makefile index e3e0d6c..5068849 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ HELM := helm -FILTER_CHARTS := contrail-helper helm-toolkit +FILTER_CHARTS := helm-toolkit CONTRAIL_CHARTS := $(FILTER_CHARTS) $(filter-out $(FILTER_CHARTS), $(patsubst %/Chart.yaml, %, $(wildcard */Chart.yaml))) BUILD_CHARTS := $(foreach chart, $(CONTRAIL_CHARTS), build-$(chart)) diff --git a/contrail-analytics/requirements.yaml b/contrail-analytics/requirements.yaml index 3efee05..4b15632 100644 --- a/contrail-analytics/requirements.yaml +++ b/contrail-analytics/requirements.yaml @@ -1,7 +1,4 @@ dependencies: - - name: contrail-helper - repository: http://localhost:8879/charts - version: 0.1.0 - name: helm-toolkit repository: http://localhost:8879/charts version: 0.1.0 diff --git a/contrail-controller/requirements.yaml b/contrail-controller/requirements.yaml index 3efee05..4b15632 100644 --- a/contrail-controller/requirements.yaml +++ b/contrail-controller/requirements.yaml @@ -1,7 +1,4 @@ dependencies: - - name: contrail-helper - repository: http://localhost:8879/charts - version: 0.1.0 - name: helm-toolkit repository: http://localhost:8879/charts version: 0.1.0 diff --git a/contrail-helper/Chart.yaml b/contrail-helper/Chart.yaml deleted file mode 100644 index 2933195..0000000 --- a/contrail-helper/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -name: contrail-helper -description: Helper helm chart for various contrail charts -version: 0.1.0 -appVersion: Contrail 5.0.0 -home: https://github.com/Juniper/contrail-docker/ -sources: - - https://github.com/Juniper/contrail-controller/ -tillerVersion: ">=2.4.0" -keywords: - - Contrail - - SDN diff --git a/contrail-helper/templates/_endpoint_host_lookup.tpl b/contrail-helper/templates/_endpoint_host_lookup.tpl deleted file mode 100644 index 6dd7b5f..0000000 --- a/contrail-helper/templates/_endpoint_host_lookup.tpl +++ /dev/null @@ -1,19 +0,0 @@ -{{/* -Name: contrail-helper.get_endpoint_host -Description: Template for entrypoint init container to check the dependency -Arguements: - 1. context - 2. endpoint name -*/}} - -{{- define "contrail-helper.get_endpoint_host" -}} - -{{- $context := index . 0 }} -{{- $endpoint_type := index . 1 }} -{{- $endpoint_dict := index $context.Values.endpoints $endpoint_type }} -{{- $cluster_domain := $context.Values.endpoints.cluster_domain }} -{{- $namespace := $endpoint_dict.namespace | default $context.Release.Namespace }} -{{- $endpoint_host := $endpoint_dict.host }} -{{- printf "%s.%s.%s" $endpoint_host $namespace $cluster_domain }} - -{{- end }} diff --git a/contrail-helper/templates/kubernetes_spec/_entrypoint_init_container.yaml b/contrail-helper/templates/kubernetes_spec/_entrypoint_init_container.yaml deleted file mode 100644 index 66d6e62..0000000 --- a/contrail-helper/templates/kubernetes_spec/_entrypoint_init_container.yaml +++ /dev/null @@ -1,46 +0,0 @@ -{{/* -Name: contrail-helper.kubernetes_spec.get_entrypoint_init_container -Description: Template for entrypoint init container to check the dependency -Arguements: - 1. context - 2. dependencies -*/}} - -{{- define "contrail-helper.kubernetes_spec.get_entrypoint_init_container" -}} -{{- $context := index . 0 -}} -{{- $dependencies := index . 1 -}} - -{{- if not $dependencies.services -}}{{- $_ := set $dependencies "services" list -}}{{- end -}} -{{- if not $dependencies.jobs -}}{{- $_ := set $dependencies "jobs" list -}}{{- end -}} -{{- if not $dependencies.daemonset -}}{{- $_ := set $dependencies "daemonset" list -}}{{- end -}} -{{- if not $dependencies.container -}}{{- $_ := set $dependencies "container" list -}}{{- end -}} - -- name: init - image: {{ $context.Values.images.tags.dep_check }} - imagePullPolicy: {{ $context.Values.images.pull_policy }} - env: - - name: POD_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.name - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - - name: INTERFACE_NAME - value: eth0 - - name: DEPENDENCY_SERVICE - value: {{ $dependencies.services | join "," | quote}} - - name: DEPENDENCY_JOBS - value: {{ $dependencies.jobs | join "," | quote }} - - name: DEPENDENCY_DAEMONSET - value: {{ $dependencies.daemonset | join "," | quote }} - - name: DEPENDENCY_CONTAINER - value: {{ $dependencies.container | join "," | quote }} - - name: COMMAND - value: "echo \"Dependencies Resolved for pod $POD_NAME\"" - command: - - kubernetes-entrypoint -{{- end -}} diff --git a/contrail-helper/templates/kubernetes_spec/_metadata_label.yaml b/contrail-helper/templates/kubernetes_spec/_metadata_label.yaml deleted file mode 100644 index 5ed69f2..0000000 --- a/contrail-helper/templates/kubernetes_spec/_metadata_label.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{/* -Name: contrail-helper.kubernetes_spec.get_metadata_label -Description: Template for metadata label spec -Arguements: - 1. context - 2. application name - 3. component name -*/}} - -{{- define "contrail-helper.kubernetes_spec.get_metadata_label" -}} -{{- $context := index . 0 -}} -{{- $application := index . 1 -}} -{{- $component := index . 2 -}} -helm_release: {{ $context.Release.Name }} -application: {{ $application }} -component: {{ $component }} -{{- end -}} diff --git a/contrail-helper/values.yaml b/contrail-helper/values.yaml deleted file mode 100644 index 2203224..0000000 --- a/contrail-helper/values.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -conf: - # host_os - (OPTIONAL) host operating system release. Sample values "ubuntu" and "centos". Default is ubuntu - host_os: ubuntu - controller_nodes: - 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 -endpoints: - # TO-DO - default: null diff --git a/contrail-thirdparty/requirements.yaml b/contrail-thirdparty/requirements.yaml index 3efee05..4b15632 100644 --- a/contrail-thirdparty/requirements.yaml +++ b/contrail-thirdparty/requirements.yaml @@ -1,7 +1,4 @@ dependencies: - - name: contrail-helper - repository: http://localhost:8879/charts - version: 0.1.0 - name: helm-toolkit repository: http://localhost:8879/charts version: 0.1.0 diff --git a/contrail-vrouter/requirements.yaml b/contrail-vrouter/requirements.yaml index 3efee05..4b15632 100644 --- a/contrail-vrouter/requirements.yaml +++ b/contrail-vrouter/requirements.yaml @@ -1,7 +1,4 @@ dependencies: - - name: contrail-helper - repository: http://localhost:8879/charts - version: 0.1.0 - name: helm-toolkit repository: http://localhost:8879/charts version: 0.1.0