From fcef994a85ee1e2f581e2dc2d2f2ab968632db25 Mon Sep 17 00:00:00 2001 From: yuryn Date: Thu, 26 Oct 2017 17:10:50 +0300 Subject: Add option to disable specific deployments Add option to disable any deployment by using conditions in helm templates. Each deployment will get helm parameter - boolean flag allowing to disable it. The flags can be listed in the custom values.yaml file that can be passed to the createAll script with '-v' command line option. Change-Id: I32b795de46c72915c2201c94c23f4e061971bb56 Issue-ID: OOM-380 Signed-off-by: yuryn --- kubernetes/vfc/templates/all-services.yaml | 37 +++++++++++++++------- .../vfc/templates/vfc-catalog-deployment.yaml | 4 ++- .../vfc/templates/vfc-emsdriver-deployment.yaml | 4 ++- .../vfc/templates/vfc-gvnfmdriver-deployment.yaml | 4 ++- .../vfc/templates/vfc-hwvnfmdriver-deployment.yaml | 4 ++- .../vfc/templates/vfc-jujudriver-deployment.yaml | 4 ++- kubernetes/vfc/templates/vfc-nslcm-deployment.yaml | 4 ++- .../vfc/templates/vfc-resmgr-deployment.yaml | 4 ++- .../vfc/templates/vfc-vnflcm-deployment.yaml | 4 ++- .../vfc/templates/vfc-vnfmgr-deployment.yaml | 4 ++- .../vfc/templates/vfc-vnfres-deployment.yaml | 4 ++- .../vfc/templates/vfc-workflow-deployment.yaml | 4 ++- .../templates/vfc-ztesdncdriver-deployment.yaml | 4 ++- .../vfc-ztevmanagerdriver-deployment.yaml | 4 ++- 14 files changed, 65 insertions(+), 24 deletions(-) (limited to 'kubernetes/vfc') diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml index a54dc00b2c..cd3c9c9136 100755 --- a/kubernetes/vfc/templates/all-services.yaml +++ b/kubernetes/vfc/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcNslcm }} apiVersion: v1 kind: Service metadata: @@ -24,7 +25,8 @@ spec: selector: app: vfc-nslcm type: NodePort - +#{{ end }} +#{{ if not .Values.disableVfcVfcResmgr }} --- apiVersion: v1 kind: Service @@ -52,7 +54,8 @@ spec: selector: app: vfc-resmgr type: NodePort - +#{{ end }} +#{{ if not .Values.disableVfcVfcGvnfmdriver }} --- apiVersion: v1 kind: Service @@ -80,7 +83,8 @@ spec: selector: app: vfc-gvnfmdriver type: NodePort - +#{{ end }} +#{{ if not .Values.disableVfcVfcZtevmanagerdriver }} --- apiVersion: v1 kind: Service @@ -108,7 +112,8 @@ spec: selector: app: vfc-ztevmanagerdriver type: NodePort - +#{{ end }} +#{{ if not .Values.disableVfcVfcHwvnfmdriver }} --- apiVersion: v1 kind: Service @@ -136,7 +141,8 @@ spec: selector: app: vfc-hwvnfmdriver type: NodePort - +#{{ end }} +#{{ if not .Values.disableVfcVfcZtesdncdriver }} --- apiVersion: v1 kind: Service @@ -164,7 +170,8 @@ spec: selector: app: vfc-ztesdncdriver type: NodePort - +#{{ end }} +#{{ if not .Values.disableVfcVfcJujudriver }} --- apiVersion: v1 kind: Service @@ -192,7 +199,8 @@ spec: selector: app: vfc-jujudriver type: NodePort - +#{{ end }} +#{{ if not .Values.disableVfcVfcVnflcm }} --- apiVersion: v1 kind: Service @@ -220,7 +228,8 @@ spec: selector: app: vfc-vnflcm type: NodePort - +#{{ end }} +#{{ if not .Values.disableVfcVfcVnfres }} --- apiVersion: v1 kind: Service @@ -248,7 +257,8 @@ spec: selector: app: vfc-vnfres type: NodePort - +#{{ end }} +#{{ if not .Values.disableVfcVfcVnfmgr }} --- apiVersion: v1 kind: Service @@ -276,7 +286,8 @@ spec: selector: app: vfc-vnfmgr type: NodePort - +#{{ end }} +#{{ if not .Values.disableVfcVfcEmsdriver }} --- apiVersion: v1 kind: Service @@ -304,6 +315,8 @@ spec: selector: app: vfc-emsdriver type: NodePort +#{{ end }} +#{{ if not .Values.disableVfcVfcWorkflow }} --- apiVersion: v1 kind: Service @@ -331,7 +344,8 @@ spec: selector: app: vfc-workflow type: NodePort - +#{{ end }} +#{{ if not .Values.disableVfcVfcCatalog }} --- apiVersion: v1 kind: Service @@ -359,3 +373,4 @@ spec: selector: app: vfc-catalog type: NodePort +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-catalog-deployment.yaml b/kubernetes/vfc/templates/vfc-catalog-deployment.yaml index c20690ba93..1782e24807 100755 --- a/kubernetes/vfc/templates/vfc-catalog-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-catalog-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcCatalog }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml index f8fa88ff69..6adc0dc833 100755 --- a/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcEmsdriver }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml index 4aa67e2edb..18558afada 100755 --- a/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcGvnfmdriver }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml index 9240695243..e9d3282ef7 100755 --- a/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcHwvnfmdriver }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml b/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml index 7ff923a256..28a3c1e6b6 100755 --- a/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcJujudriver }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml b/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml index 235c11c1e6..400a680a9a 100755 --- a/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcNslcm }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml b/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml index 6b7eb64a2b..2c6a895518 100755 --- a/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcResmgr }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml index 7d4a900224..0d8922973b 100755 --- a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcVnflcm }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml b/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml index 24dbc19981..566c3cabbd 100755 --- a/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcVnfmgr }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml b/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml index 1d4f295c9b..50b52b1a77 100755 --- a/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcVnfres }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml index 1db80b9393..097986cdd0 100755 --- a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcWorkflow }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml index 82e0bd703d..828e7b32b1 100755 --- a/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcZtesdncdriver }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml index 29aafd67f5..5559cd05ac 100755 --- a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVfcVfcZtevmanagerdriver }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -31,4 +32,5 @@ spec: periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file -- cgit 1.2.3-korg