diff options
119 files changed, 392 insertions, 68 deletions
diff --git a/docs/OOM User Guide/oom_user_guide.rst b/docs/OOM User Guide/oom_user_guide.rst index c55ccaa6cc..ee3b2f1430 100644 --- a/docs/OOM User Guide/oom_user_guide.rst +++ b/docs/OOM User Guide/oom_user_guide.rst @@ -882,11 +882,11 @@ Integration with MSB ==================== The \ `Microservices Bus -Project <file:///C:\display\DW\Microservices+Bus+Project>`__ provides +Project <https://wiki.onap.org/pages/viewpage.action?pageId=3246982>`__ provides facilities to integrate micro-services into ONAP and therefore needs to integrate into OOM - primarily through Consul which is the backend of MSB service discovery. The following is a brief description of how this -integration will be done (thanks Huabing): +integration will be done: A registrator to push the service endpoint info to MSB service discovery. @@ -910,10 +910,10 @@ discovery. Details of the registration service API can be found at \ `Microservice Bus API -Documentation <file:///C:\display\DW\Microservice+Bus+API+Documentation>`__. +Documentation <https://wiki.onap.org/display/DW/Microservice+Bus+API+Documentation>`__. How to define the service endpoints using annotation \ `ONAP Services -List#OOMIntegration <file:///C:\display\DW\ONAP+Services+List#ONAPServicesList-OOMIntegration>`__ +List#OOMIntegration <https://wiki.onap.org/display/DW/ONAP+Services+List#ONAPServicesList-OOMIntegration>`__ A preliminary view of the OOM-MSB integration is as follows: @@ -925,32 +925,21 @@ A message sequence chart of the registration process: MSB Usage Instructions ---------------------- +MSB provides kubernetes charts in OOM, so it can be spun up by oom oneclick command. -**Pull and run MSB docker containers** (Login the ONAP docker registry first:):: +Please note that kubernetes authentication token must be set at *kubernetes/kube2msb/values.yaml* so the kube2msb registrator can get the access to watch the kubernetes events and get service annotation by kubernetes APIs. The token can be found in the kubectl configuration file *~/.kube/config* - docker login -u docker -p docker nexus3.onap.org:10001 +MSB and kube2msb can be spun up with all the ONAP components together, or separately using the following commands. - sudo docker run -d --net=host --name msb\_consul consul agent -dev +**Start MSB services**:: - sudo docker run -d --net=host --name msb\_discovery nexus3.onap.org:10001/onap/msb/msb\_discovery + createAll.bash -n onap -a msb - sudo docker run -d --net=host -e "ROUTE\_LABELS=visualRange:1" --name msb\_internal\_apigateway nexus3.onap.org:10001/onap/msb/msb\_apigateway +**Start kube2msb registrator**:: -**Register a REST service to MSB via curl**:: + createAll.bash -n onap -a kube2msb - curl -X POST \\ - - -H "Content-Type: application/json" \\ - - -d '{"serviceName": "aai", "version": "v8", "url": - "/aai/v8/","protocol": "REST", "path": "/aai/v8", "nodes": [ {"ip": - "10.74.215.65","port": "8443"}]}' \\ - - "http://127.0.0.1:10081/api/microservices/v1/services” - -**Test the REST Service via the internal API gateway**:: - - curl http://127.0.0.1/aai/v8/cloud-infrastructure/cloud-regions +More details can be found here `MSB installation <http://onap.readthedocs.io/en/latest/submodules/msb/apigateway.git/docs/platform/installation.html>`__. FAQ (Frequently Asked Questions) ================================ diff --git a/kubernetes/aaf/templates/aaf-cs-deployment.yaml b/kubernetes/aaf/templates/aaf-cs-deployment.yaml index 23968f9313..acd6a7aeb6 100644 --- a/kubernetes/aaf/templates/aaf-cs-deployment.yaml +++ b/kubernetes/aaf/templates/aaf-cs-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAafAafCs }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -34,3 +35,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml index 5950b92c00..56c99ea37f 100644 --- a/kubernetes/aaf/templates/aaf-deployment.yaml +++ b/kubernetes/aaf/templates/aaf-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAafAaf }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -62,3 +63,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data2 imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aaf/templates/all-services.yaml b/kubernetes/aaf/templates/all-services.yaml index 0d1dc2298c..be04180089 100644 --- a/kubernetes/aaf/templates/all-services.yaml +++ b/kubernetes/aaf/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAafAafCs }} apiVersion: v1 kind: Service metadata: @@ -18,6 +19,8 @@ spec: selector: app: aaf-cs clusterIP: None +#{{ end }} +#{{ if not .Values.disableAafAaf }} --- apiVersion: v1 kind: Service @@ -34,3 +37,4 @@ spec: selector: app: clamp type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml index dc375cb6bc..3f714f3e64 100644 --- a/kubernetes/aai/templates/aai-deployment.yaml +++ b/kubernetes/aai/templates/aai-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAaiAaiService }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -68,3 +69,4 @@ spec: restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml index b0d437b61d..ebf447f3ca 100644 --- a/kubernetes/aai/templates/aai-resources-deployment.yaml +++ b/kubernetes/aai/templates/aai-resources-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAaiAaiResources }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -112,4 +113,4 @@ metadata: namespace: {{ .Values.nsPrefix }}-aai data: {{ (.Files.Glob "resources/resources/conf/logback.xml").AsConfig | indent 2 }} - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml index d2a9c42f3f..a54c49a59d 100644 --- a/kubernetes/aai/templates/aai-traversal-deployment.yaml +++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAaiAaiTraversal }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -114,4 +115,4 @@ metadata: namespace: {{ .Values.nsPrefix }}-aai data: {{ (.Files.Glob "resources/traversal/conf/logback.xml").AsConfig | indent 2 }} - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml index 01e24e8373..df7e3567d0 100644 --- a/kubernetes/aai/templates/all-services.yaml +++ b/kubernetes/aai/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAaiHbase }} apiVersion: v1 kind: Service metadata: @@ -24,6 +25,8 @@ spec: selector: app: hbase clusterIP: None +#{{ end }} +#{{ if not .Values.disableAaiAaiService }} --- apiVersion: v1 kind: Service @@ -162,6 +165,8 @@ spec: type: NodePort selector: app: aai-service +#{{ end }} +#{{ if not .Values.disableAaiModelLoaderService }} --- apiVersion: v1 kind: Service @@ -181,6 +186,7 @@ spec: type: NodePort selector: app: model-loader-service +#{{ end }} --- apiVersion: v1 kind: Service @@ -196,6 +202,7 @@ spec: selector: app: gremlin clusterIP: None +#{{ if not .Values.disableAaiElasticsearch }} --- apiVersion: v1 kind: Service @@ -211,6 +218,8 @@ spec: selector: app: elasticsearch clusterIP: None +#{{ end }} +#{{ if not .Values.disableAaiSearchDataService }} --- apiVersion: v1 kind: Service @@ -226,6 +235,8 @@ spec: selector: app: search-data-service clusterIP: None +#{{ end }} +#{{ if not .Values.disableAaiAaiTraversal }} --- apiVersion: v1 kind: Service @@ -243,6 +254,8 @@ spec: selector: app: aai-traversal clusterIP: None +#{{ end }} +#{{ if not .Values.disableAaiAaiResources }} --- apiVersion: v1 kind: Service @@ -260,6 +273,8 @@ spec: selector: app: aai-resources clusterIP: None +#{{ end }} +#{{ if not .Values.disableAaiSparkyBe }} --- apiVersion: v1 kind: Service @@ -274,4 +289,5 @@ spec: port: 9517 selector: app: sparky-be - clusterIP: None
\ No newline at end of file + clusterIP: None +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml index 4473dcf8fe..6b3c024c2a 100644 --- a/kubernetes/aai/templates/data-router-deployment.yaml +++ b/kubernetes/aai/templates/data-router-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAaiDataRouter }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -65,3 +66,4 @@ spec: restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aai/templates/elasticsearch-deployment.yaml b/kubernetes/aai/templates/elasticsearch-deployment.yaml index 1fc92addfc..680f942c52 100644 --- a/kubernetes/aai/templates/elasticsearch-deployment.yaml +++ b/kubernetes/aai/templates/elasticsearch-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAaiElasticsearch }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -45,3 +46,4 @@ spec: path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/es-data" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml index c261504d22..fd8e10cc5a 100644 --- a/kubernetes/aai/templates/hbase-deployment.yaml +++ b/kubernetes/aai/templates/hbase-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAaiHbase }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -41,3 +42,4 @@ spec: path: /etc/localtime imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml index f800c446eb..7c2fddb7cf 100644 --- a/kubernetes/aai/templates/modelloader-deployment.yaml +++ b/kubernetes/aai/templates/modelloader-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAaiModelLoaderService }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -72,4 +73,4 @@ metadata: namespace: {{ .Values.nsPrefix }}-aai data: {{ (.Files.Glob "resources/model-loader/conf/logback.xml").AsConfig | indent 2 }} - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml index 3eb0c5c714..60fdbb50cd 100644 --- a/kubernetes/aai/templates/search-data-service-deployment.yaml +++ b/kubernetes/aai/templates/search-data-service-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAaiSearchDataService }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -80,4 +81,4 @@ metadata: namespace: {{ .Values.nsPrefix }}-aai data: {{ (.Files.Glob "resources/search-data-service/conf/logback.xml").AsConfig | indent 2 }} - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml index ee9e067281..c60725ee15 100644 --- a/kubernetes/aai/templates/sparky-be-deployment.yaml +++ b/kubernetes/aai/templates/sparky-be-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAaiSparkyBe }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -80,4 +81,4 @@ metadata: namespace: {{ .Values.nsPrefix }}-aai data: {{ (.Files.Glob "resources/sparky-be/conf/logback.xml").AsConfig | indent 2 }} - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/appc/templates/all-services.yaml b/kubernetes/appc/templates/all-services.yaml index 5c42d72a01..8f7ed19ae1 100644 --- a/kubernetes/appc/templates/all-services.yaml +++ b/kubernetes/appc/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAppcAppcDbhost }} apiVersion: v1 kind: Service metadata: @@ -40,6 +41,8 @@ spec: selector: app: appc-dbhost clusterIP: None +#{{ end }} +#{{ if not .Values.disableAppcAppc }} --- apiVersion: v1 kind: Service @@ -60,6 +63,8 @@ spec: type: NodePort selector: app: appc +#{{ end }} +#{{ if not .Values.disableAppcAppcDgbuilder }} --- apiVersion: v1 kind: Service @@ -77,3 +82,4 @@ spec: type: NodePort selector: app: appc-dgbuilder +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml index 9beaacaa66..e379c167d7 100644 --- a/kubernetes/appc/templates/appc-deployment.yaml +++ b/kubernetes/appc/templates/appc-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAppcAppc }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -111,3 +112,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/appc/templates/appc-pv-pvc.yaml b/kubernetes/appc/templates/appc-pv-pvc.yaml index 2ce6228953..1702ba8ecb 100644 --- a/kubernetes/appc/templates/appc-pv-pvc.yaml +++ b/kubernetes/appc/templates/appc-pv-pvc.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAppcAppcDbhost }} apiVersion: v1 kind: PersistentVolume metadata: @@ -28,3 +29,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-appc-db" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/appc/templates/db-deployment.yaml b/kubernetes/appc/templates/db-deployment.yaml index 560f48220d..607a0df81f 100644 --- a/kubernetes/appc/templates/db-deployment.yaml +++ b/kubernetes/appc/templates/db-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAppcAppcDbhost }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -44,3 +45,4 @@ spec: claimName: appc-db imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml index a2bd4a1bbb..b9495a740b 100644 --- a/kubernetes/appc/templates/dgbuilder-deployment.yaml +++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableAppcAppcDgbuilder }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -74,3 +75,4 @@ spec: restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/clamp/templates/all-services.yaml b/kubernetes/clamp/templates/all-services.yaml index 20ec58415d..163ed58aa9 100644 --- a/kubernetes/clamp/templates/all-services.yaml +++ b/kubernetes/clamp/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableClampClampMariadb }} apiVersion: v1 kind: Service metadata: @@ -12,6 +13,8 @@ spec: selector: app: clamp-mariadb clusterIP: None +#{{ end }} +#{{ if not .Values.disableClampClamp }} --- apiVersion: v1 kind: Service @@ -26,3 +29,4 @@ spec: selector: app: clamp type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/clamp/templates/clamp-deployment.yaml b/kubernetes/clamp/templates/clamp-deployment.yaml index ea3ef19456..493bb49b9e 100644 --- a/kubernetes/clamp/templates/clamp-deployment.yaml +++ b/kubernetes/clamp/templates/clamp-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableClampClamp }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -57,3 +58,4 @@ spec: periodSeconds: 10 imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml index 2f796258ac..46a6433b7e 100644 --- a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml +++ b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableClampClampMariadb }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -47,3 +48,4 @@ spec: claimName: clamp-db imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/clamp/templates/clamp-pv-pvc.yaml b/kubernetes/clamp/templates/clamp-pv-pvc.yaml index 5a82752a17..0d36141b6c 100644 --- a/kubernetes/clamp/templates/clamp-pv-pvc.yaml +++ b/kubernetes/clamp/templates/clamp-pv-pvc.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableClampClampMariadb }} apiVersion: v1 kind: PersistentVolume metadata: @@ -28,3 +29,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-clamp-db" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/cli/templates/all-service.yaml b/kubernetes/cli/templates/all-service.yaml index ffd9f68187..e848bfdc38 100644 --- a/kubernetes/cli/templates/all-service.yaml +++ b/kubernetes/cli/templates/all-service.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableCliCli }} apiVersion: v1 kind: Service metadata: @@ -14,3 +15,4 @@ spec: type: NodePort selector: app: cli +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/cli/templates/cli-deployment.yaml b/kubernetes/cli/templates/cli-deployment.yaml index 88cb3eb3dc..3a702b9016 100644 --- a/kubernetes/cli/templates/cli-deployment.yaml +++ b/kubernetes/cli/templates/cli-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableCliCli }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -32,3 +33,4 @@ spec: periodSeconds: 10 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/consul/templates/consul-agent-deployment.yaml b/kubernetes/consul/templates/consul-agent-deployment.yaml index 15318660b5..aa8e096f6a 100644 --- a/kubernetes/consul/templates/consul-agent-deployment.yaml +++ b/kubernetes/consul/templates/consul-agent-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableConsulConsulAgent }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -27,3 +28,4 @@ spec: - hostPath: path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-agent-config name: consul-agent-config +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/consul/templates/consul-server-deployment.yaml b/kubernetes/consul/templates/consul-server-deployment.yaml index e914b6b198..a2feb9f6a3 100644 --- a/kubernetes/consul/templates/consul-server-deployment.yaml +++ b/kubernetes/consul/templates/consul-server-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableConsulConsulServer }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -28,3 +29,4 @@ spec: - hostPath: path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-server-config name: consul-server-config +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/consul/templates/consul-server-service.yaml b/kubernetes/consul/templates/consul-server-service.yaml index 465456425e..3dd801664c 100644 --- a/kubernetes/consul/templates/consul-server-service.yaml +++ b/kubernetes/consul/templates/consul-server-service.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableConsulConsulServer }} apiVersion: v1 kind: Service metadata: @@ -20,3 +21,4 @@ spec: selector: app: consul-server type: {{ .Values.service.type | quote }} +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcae/templates/all-services.yaml b/kubernetes/dcae/templates/all-services.yaml index 45d22dba21..b0170734dd 100644 --- a/kubernetes/dcae/templates/all-services.yaml +++ b/kubernetes/dcae/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaeZookeeper }} apiVersion: v1 kind: Service metadata: @@ -12,6 +13,8 @@ spec: selector: app: zookeeper clusterIP: None +#{{ end }} +#{{ if not .Values.disableDcaeKafka }} --- apiVersion: v1 kind: Service @@ -27,6 +30,8 @@ spec: selector: app: kafka clusterIP: None +#{{ end }} +#{{ if not .Values.disableDcaeDmaap }} --- apiVersion: v1 kind: Service @@ -48,6 +53,8 @@ spec: app: dmaap #type: NodePort clusterIP: None +#{{ end }} +#{{ if not .Values.disableDcaeDcaePgaas }} --- apiVersion: v1 kind: Service @@ -65,6 +72,8 @@ spec: targetPort: 5432 nodePort: {{ .Values.nodePortPrefix }}45 type: NodePort +#{{ end }} +#{{ if not .Values.disableDcaeDcaeCollectorCommonEvent }} --- apiVersion: v1 kind: Service @@ -91,6 +100,8 @@ spec: selector: app: dcae-collector-common-event type: NodePort +#{{ end }} +#{{ if not .Values.disableDcaeDcaeCollectorDmaapbc }} --- apiVersion: v1 kind: Service @@ -115,3 +126,4 @@ spec: selector: app: dcae-collector-dmaapbc type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcae/templates/cdap0-dep.yaml b/kubernetes/dcae/templates/cdap0-dep.yaml index d438ab9477..c6239e219b 100644 --- a/kubernetes/dcae/templates/cdap0-dep.yaml +++ b/kubernetes/dcae/templates/cdap0-dep.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaeCdap }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -82,3 +83,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap0-opt-data imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcae/templates/cdap1-dep.yaml b/kubernetes/dcae/templates/cdap1-dep.yaml index efc64da203..64f69d32dd 100644 --- a/kubernetes/dcae/templates/cdap1-dep.yaml +++ b/kubernetes/dcae/templates/cdap1-dep.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaeCdap }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -82,3 +83,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap1-opt-data imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcae/templates/cdap2-dep.yaml b/kubernetes/dcae/templates/cdap2-dep.yaml index 64f8e300b7..f6d6ec70e4 100644 --- a/kubernetes/dcae/templates/cdap2-dep.yaml +++ b/kubernetes/dcae/templates/cdap2-dep.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaeCdap }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -82,3 +83,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap2-opt-data imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcae/templates/dcae-collector-common-event.yaml b/kubernetes/dcae/templates/dcae-collector-common-event.yaml index c77e5a4d96..aa51f140ff 100644 --- a/kubernetes/dcae/templates/dcae-collector-common-event.yaml +++ b/kubernetes/dcae/templates/dcae-collector-common-event.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaeDcaeCollectorCommonEvent }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -36,3 +37,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/common-event/config imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml b/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml index a36d5061f2..5de893b867 100644 --- a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml +++ b/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaeDcaeCollectorDmaapbc }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -35,3 +36,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dmaapbc/config imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcae/templates/dcae-controller.yaml b/kubernetes/dcae/templates/dcae-controller.yaml index 459e81e8b3..30f3afb907 100644 --- a/kubernetes/dcae/templates/dcae-controller.yaml +++ b/kubernetes/dcae/templates/dcae-controller.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaeDcaeController }} apiVersion: v1 kind: Service metadata: @@ -59,3 +60,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dcae-controller/config imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcae/templates/dcae-dmaap.yaml b/kubernetes/dcae/templates/dcae-dmaap.yaml index e1f61e5135..885620b18d 100644 --- a/kubernetes/dcae/templates/dcae-dmaap.yaml +++ b/kubernetes/dcae/templates/dcae-dmaap.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaeDmaap }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -73,3 +74,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dmaap/mykey imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcae/templates/dcae-kafka.yaml b/kubernetes/dcae/templates/dcae-kafka.yaml index 9a092264f9..9bfca2bd94 100644 --- a/kubernetes/dcae/templates/dcae-kafka.yaml +++ b/kubernetes/dcae/templates/dcae-kafka.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaeKafka }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -81,3 +82,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcae/templates/dcae-zookeeper.yaml b/kubernetes/dcae/templates/dcae-zookeeper.yaml index 8d03c9d985..189a03952d 100644 --- a/kubernetes/dcae/templates/dcae-zookeeper.yaml +++ b/kubernetes/dcae/templates/dcae-zookeeper.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaeZookeeper }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -29,3 +30,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcae/templates/pgaas.yaml b/kubernetes/dcae/templates/pgaas.yaml index de62be501a..788de60231 100644 --- a/kubernetes/dcae/templates/pgaas.yaml +++ b/kubernetes/dcae/templates/pgaas.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaeDcaePgaas }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -45,3 +46,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/pgaas/tools imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/dcaegen2/templates/pod.yaml b/kubernetes/dcaegen2/templates/pod.yaml index e275ff671d..ffb3716ecf 100644 --- a/kubernetes/dcaegen2/templates/pod.yaml +++ b/kubernetes/dcaegen2/templates/pod.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableDcaegen2 }} apiVersion: v1 kind: Pod metadata: @@ -25,4 +26,5 @@ spec: name: "{{ .Chart.Name }}-config-inputs" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" - restartPolicy: Never
\ No newline at end of file + restartPolicy: Never +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml index 92c56c68cc..9df3aa8fa5 100644 --- a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml +++ b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableKube2MsbKube2MsbRegistrator }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -29,3 +30,4 @@ spec: imagePullPolicy: {{ .Values.pullPolicy }} imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/log/templates/all-services.yaml b/kubernetes/log/templates/all-services.yaml index 5f9412e872..3984f12521 100644 --- a/kubernetes/log/templates/all-services.yaml +++ b/kubernetes/log/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableLogElasticsearch }} apiVersion: v1 kind: Service metadata: @@ -14,6 +15,8 @@ spec: selector: app: elasticsearch type: NodePort +#{{ end }} +#{{ if not .Values.disableLogLogstash }} --- apiVersion: v1 kind: Service @@ -29,6 +32,8 @@ spec: targetPort: 5044 selector: app: logstash +#{{ end }} +#{{ if not .Values.disableLogKibana }} --- apiVersion: v1 kind: Service @@ -46,4 +51,4 @@ spec: selector: app: kibana type: NodePort - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/log/templates/elasticsearch-deployment.yaml b/kubernetes/log/templates/elasticsearch-deployment.yaml index 75df8a16e1..f0db31a289 100644 --- a/kubernetes/log/templates/elasticsearch-deployment.yaml +++ b/kubernetes/log/templates/elasticsearch-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableLogElasticsearch }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -78,4 +79,5 @@ metadata: name: elasticsearch-configmap namespace: {{ .Values.nsPrefix }}-log data: -{{ (.Files.Glob "resources/elasticsearch/conf/elasticsearch.yml").AsConfig | indent 2 }}
\ No newline at end of file +{{ (.Files.Glob "resources/elasticsearch/conf/elasticsearch.yml").AsConfig | indent 2 }} +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/log/templates/kibana-deployment.yaml b/kubernetes/log/templates/kibana-deployment.yaml index f8070ef780..9ff26da798 100644 --- a/kubernetes/log/templates/kibana-deployment.yaml +++ b/kubernetes/log/templates/kibana-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableLogKibana }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -68,4 +69,5 @@ metadata: name: kibana-configmap namespace: {{ .Values.nsPrefix }}-log data: -{{ (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig | indent 2 }}
\ No newline at end of file +{{ (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig | indent 2 }} +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/log/templates/log-pv-pvc.yaml b/kubernetes/log/templates/log-pv-pvc.yaml index 989b118ca9..4f244718d0 100644 --- a/kubernetes/log/templates/log-pv-pvc.yaml +++ b/kubernetes/log/templates/log-pv-pvc.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableLogElasticsearch }} apiVersion: v1 kind: PersistentVolume metadata: @@ -28,3 +29,4 @@ spec: selector: matchLabels: name: elasticsearch-db +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/log/templates/logstash-deployment.yaml b/kubernetes/log/templates/logstash-deployment.yaml index 23d590690f..c4d46b7eff 100644 --- a/kubernetes/log/templates/logstash-deployment.yaml +++ b/kubernetes/log/templates/logstash-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableLogLogstash }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -80,3 +81,4 @@ metadata: data: {{ (.Files.Glob "resources/logstash/conf/logstash.yml").AsConfig | indent 2 }} {{ (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig | indent 2 }} +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml index 418a3eda89..e76a1d9431 100644 --- a/kubernetes/message-router/templates/all-services.yaml +++ b/kubernetes/message-router/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMessageRouterZookeeper }} apiVersion: v1 kind: Service metadata: @@ -12,6 +13,8 @@ spec: selector: app: zookeeper clusterIP: None +#{{ end }} +#{{ if not .Values.disableMessageRouterGlobalKafka }} --- apiVersion: v1 kind: Service @@ -27,6 +30,8 @@ spec: selector: app: global-kafka clusterIP: None +#{{ end }} +#{{ if not .Values.disableMessageRouterDmaap }} --- apiVersion: v1 kind: Service @@ -58,3 +63,4 @@ spec: selector: app: dmaap type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml index 1cc79c819e..67d51fd00e 100644 --- a/kubernetes/message-router/templates/message-router-dmaap.yaml +++ b/kubernetes/message-router/templates/message-router-dmaap.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMessageRouterDmaap }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -79,3 +80,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/mykey imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +{{ end }}
\ No newline at end of file diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml index 1564f9b03a..3e2628b750 100644 --- a/kubernetes/message-router/templates/message-router-kafka.yaml +++ b/kubernetes/message-router/templates/message-router-kafka.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMessageRouterGlobalKafka }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -87,3 +88,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/message-router/templates/message-router-pv-pvc.yaml b/kubernetes/message-router/templates/message-router-pv-pvc.yaml index e31e78c1fd..53329ca29b 100644 --- a/kubernetes/message-router/templates/message-router-pv-pvc.yaml +++ b/kubernetes/message-router/templates/message-router-pv-pvc.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMessageRouterGlobalKafka }} apiVersion: v1 kind: PersistentVolume metadata: @@ -28,6 +29,8 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-message-router-kafka" +#{{ end }} +#{{ if not .Values.disableMessageRouterZookeeper }} --- apiVersion: v1 kind: PersistentVolume @@ -59,3 +62,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-message-router-zookeeper" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/message-router/templates/message-router-zookeeper.yaml b/kubernetes/message-router/templates/message-router-zookeeper.yaml index 0377beb05a..47cdb51f2f 100644 --- a/kubernetes/message-router/templates/message-router-zookeeper.yaml +++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMessageRouterZookeeper }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -40,3 +41,4 @@ spec: claimName: message-router-zookeeper imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/mock/templates/all-services.yaml b/kubernetes/mock/templates/all-services.yaml index 8920191ac3..a1b0f170de 100644 --- a/kubernetes/mock/templates/all-services.yaml +++ b/kubernetes/mock/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMockSniroEmulator }} apiVersion: v1 kind: Service metadata: @@ -15,3 +16,4 @@ spec: name: http selector: app: sniro-emulator +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/mock/templates/sniroemulator-deployment.yaml b/kubernetes/mock/templates/sniroemulator-deployment.yaml index a0473c95f4..5a1d483ae1 100644 --- a/kubernetes/mock/templates/sniroemulator-deployment.yaml +++ b/kubernetes/mock/templates/sniroemulator-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMockSniroEmulator }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -23,3 +24,4 @@ spec: args: ["--verbose"] imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml index f752608984..487347393d 100644 --- a/kubernetes/msb/templates/all-services.yaml +++ b/kubernetes/msb/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMsbMsbConsul }} apiVersion: v1 kind: Service metadata: @@ -12,6 +13,8 @@ spec: selector: app: msb-consul type: NodePort +#{{ end }} +#{{ if not .Values.disableMsbMsbDiscovery }} --- apiVersion: v1 kind: Service @@ -28,6 +31,8 @@ spec: selector: app: msb-discovery type: NodePort +#{{ end }} +#{{ if not .Values.disableMsbMsbIag }} --- apiVersion: v1 kind: Service @@ -43,6 +48,8 @@ spec: selector: app: msb-iag type: NodePort +#{{ end }} +#{{ if not .Values.disableMsbMsbEag }} --- apiVersion: v1 kind: Service @@ -58,3 +65,4 @@ spec: selector: app: msb-eag type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml index fc8a95a838..4d462aa96f 100644 --- a/kubernetes/msb/templates/msb-consul-deployment.yaml +++ b/kubernetes/msb/templates/msb-consul-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMsbMsbConsul }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -27,4 +28,5 @@ spec: port: {{ .Values.consulPort }} initialDelaySeconds: 5 periodSeconds: 10 - imagePullPolicy: {{ .Values.pullPolicy }}
\ No newline at end of file + imagePullPolicy: {{ .Values.pullPolicy }} +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml index 3af9e8f858..5f8db61ac5 100644 --- a/kubernetes/msb/templates/msb-discovery-deployment.yaml +++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMsbMsbDiscovery }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -33,4 +34,4 @@ spec: imagePullPolicy: {{ .Values.pullPolicy }} imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml index 8a250fee1a..714f19b1a5 100644 --- a/kubernetes/msb/templates/msb-eag-deployment.yaml +++ b/kubernetes/msb/templates/msb-eag-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMsbMsbEag }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -37,4 +38,4 @@ spec: imagePullPolicy: {{ .Values.pullPolicy}} imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml index 251ca5e137..ca4d5a033f 100644 --- a/kubernetes/msb/templates/msb-iag-deployment.yaml +++ b/kubernetes/msb/templates/msb-iag-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMsbMsbIag }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -37,4 +38,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy}}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/mso/templates/all-services.yaml b/kubernetes/mso/templates/all-services.yaml index 96c7fd79e8..44e47c10fc 100644 --- a/kubernetes/mso/templates/all-services.yaml +++ b/kubernetes/mso/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMsoMariadb }} apiVersion: v1 kind: Service metadata: @@ -12,6 +13,8 @@ spec: selector: app: mariadb type: NodePort +#{{ end }} +#{{ if not .Values.disableMsoMso }} --- apiVersion: v1 kind: Service @@ -60,3 +63,4 @@ spec: port: 8787 nodePort: {{ .Values.nodePortPrefix }}50 type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/mso/templates/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml index d105744f7e..820d7e2239 100644 --- a/kubernetes/mso/templates/db-deployment.yaml +++ b/kubernetes/mso/templates/db-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMsoMariadb }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -55,3 +56,4 @@ spec: claimName: mso-db imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml index bf350aeca1..a33d9b08fa 100644 --- a/kubernetes/mso/templates/mso-deployment.yaml +++ b/kubernetes/mso/templates/mso-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMsoMso }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -144,3 +145,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/mso/templates/mso-pv-pvc.yaml b/kubernetes/mso/templates/mso-pv-pvc.yaml index 47389e3ff0..07b5a03f61 100644 --- a/kubernetes/mso/templates/mso-pv-pvc.yaml +++ b/kubernetes/mso/templates/mso-pv-pvc.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMsoMariadb }} apiVersion: v1 kind: PersistentVolume metadata: @@ -28,3 +29,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-mso-db" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/multicloud/templates/all-services.yaml b/kubernetes/multicloud/templates/all-services.yaml index d8de44745e..09a90d0eca 100644 --- a/kubernetes/multicloud/templates/all-services.yaml +++ b/kubernetes/multicloud/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMulticloudFramework }} apiVersion: v1 kind: Service metadata: @@ -24,6 +25,8 @@ spec: selector: app: framework type: NodePort +#{{ end }} +#{{ if not .Values.disableMulticloudMulticloudVio }} --- apiVersion: v1 kind: Service @@ -52,6 +55,8 @@ spec: selector: app: multicloud-vio type: NodePort +#{{ end }} +#{{ if not .Values.disableMulticloudMulticloudOcata }} --- apiVersion: v1 kind: Service @@ -80,6 +85,8 @@ spec: selector: app: multicloud-ocata type: NodePort +#{{ end }} +#{{ if not .Values.disableMulticloudMulticloudWindriver }} --- apiVersion: v1 kind: Service @@ -108,3 +115,4 @@ spec: selector: app: multicloud-windriver type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml index 9f122f0fd2..b2f23715c8 100644 --- a/kubernetes/multicloud/templates/framework-deployment.yaml +++ b/kubernetes/multicloud/templates/framework-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMulticloudFramework }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -55,3 +56,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/framework/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml index 8d9bd9d15a..994fe94c03 100644 --- a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml +++ b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMulticloudMulticloudOcata }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -55,5 +56,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/ocata/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" - - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml index 85a43a10db..e2274b358f 100644 --- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml +++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMulticloudMulticloudVio }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -55,5 +56,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/vio/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" - - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml index a74ea19f23..ff0f09af19 100644 --- a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml +++ b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableMulticloudMulticloudWindriver }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -55,5 +56,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/windriver/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" - - +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml index 04c984df54..a1c480458d 100644 --- a/kubernetes/policy/templates/all-services.yaml +++ b/kubernetes/policy/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePolicyMariadb }} apiVersion: v1 kind: Service metadata: @@ -12,6 +13,8 @@ spec: selector: app: mariadb clusterIP: None +#{{ end }} +#{{ if not .Values.disablePolicyNexus }} --- apiVersion: v1 kind: Service @@ -27,6 +30,8 @@ spec: selector: app: nexus clusterIP: None +#{{ end }} +#{{ if not .Values.disablePolicyDrools }} --- apiVersion: v1 kind: Service @@ -43,6 +48,8 @@ spec: selector: app: drools type: NodePort +#{{ end }} +#{{ if not .Values.disablePolicyPap }} --- apiVersion: v1 kind: Service @@ -62,6 +69,8 @@ spec: selector: app: pap type: NodePort +#{{ end }} +#{{ if not .Values.disablePolicyPdp }} --- apiVersion: v1 kind: Service @@ -98,6 +107,8 @@ spec: selector: app: pdp type: NodePort +#{{ end }} +#{{ if not .Values.disablePolicyBrmsgw }} --- apiVersion: v1 kind: Service @@ -114,3 +125,4 @@ spec: selector: app: brmsgw type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml index e47b0403ca..df5d888165 100644 --- a/kubernetes/policy/templates/dep-brmsgw.yaml +++ b/kubernetes/policy/templates/dep-brmsgw.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePolicyBrmsgw }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -69,3 +70,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml index 2f06a08791..3e9fa014fb 100644 --- a/kubernetes/policy/templates/dep-drools.yaml +++ b/kubernetes/policy/templates/dep-drools.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePolicyDrools }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -111,3 +112,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/drools/ imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/policy/templates/dep-maria.yaml b/kubernetes/policy/templates/dep-maria.yaml index e3c93d7fe6..c0f5060884 100644 --- a/kubernetes/policy/templates/dep-maria.yaml +++ b/kubernetes/policy/templates/dep-maria.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePolicyMariadb }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -39,3 +40,4 @@ spec: claimName: policy-db imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml index 15b7ec38fd..07cd334879 100644 --- a/kubernetes/policy/templates/dep-nexus.yaml +++ b/kubernetes/policy/templates/dep-nexus.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePolicyNexus }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -53,3 +54,4 @@ spec: path: /etc/localtime imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml index aeb3d6b323..0816aa5291 100644 --- a/kubernetes/policy/templates/dep-pap.yaml +++ b/kubernetes/policy/templates/dep-pap.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePolicyPap }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -128,3 +129,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml index 841d55c00e..6cc442b417 100644 --- a/kubernetes/policy/templates/dep-pdp.yaml +++ b/kubernetes/policy/templates/dep-pdp.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePolicyPdp }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -102,3 +103,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/policy/templates/policy-pv-pvc.yaml b/kubernetes/policy/templates/policy-pv-pvc.yaml index 71cf3d8a48..5dc0c61c43 100644 --- a/kubernetes/policy/templates/policy-pv-pvc.yaml +++ b/kubernetes/policy/templates/policy-pv-pvc.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePolicyMariadb }} apiVersion: v1 kind: PersistentVolume metadata: @@ -28,3 +29,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-policy-db" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml index b819b1c5e3..28ca0303b1 100644 --- a/kubernetes/portal/templates/all-services.yaml +++ b/kubernetes/portal/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePortalPortaldb }} apiVersion: v1 kind: Service metadata: @@ -12,6 +13,8 @@ spec: selector: app: portaldb clusterIP: None +#{{ end }} +#{{ if not .Values.disablePortalPortalapps }} --- apiVersion: v1 kind: Service @@ -48,6 +51,8 @@ spec: selector: app: portalapps type: NodePort +#{{ end }} +#{{ if not .Values.disablePortalVncPortal }} --- apiVersion: v1 kind: Service @@ -69,6 +74,8 @@ spec: selector: app: vnc-portal type: NodePort +#{{ end }} +#{{ if not .Values.disablePortalPortalwidgets }} --- apiVersion: v1 kind: Service @@ -84,3 +91,4 @@ spec: selector: app: portalwidgets clusterIP: None +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml index 9d32fc2a6e..75977c7be0 100755 --- a/kubernetes/portal/templates/portal-apps-deployment.yaml +++ b/kubernetes/portal/templates/portal-apps-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePortalPortalapps }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -159,3 +160,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml index 8dc7ebabf3..96084e5294 100755 --- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml +++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePortalPortaldb }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -69,3 +70,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-db/logback.xml imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/portal/templates/portal-pv-pvc.yaml b/kubernetes/portal/templates/portal-pv-pvc.yaml index 11b3dbb4e1..b4d2baa334 100644 --- a/kubernetes/portal/templates/portal-pv-pvc.yaml +++ b/kubernetes/portal/templates/portal-pv-pvc.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePortalPortaldb }} apiVersion: v1 kind: PersistentVolume metadata: @@ -28,3 +29,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-portal-db" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml index 01ef02b3b4..b4a9effe59 100644 --- a/kubernetes/portal/templates/portal-vnc-dep.yaml +++ b/kubernetes/portal/templates/portal-vnc-dep.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePortalVncPortal }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -136,3 +137,4 @@ spec: emptyDir: {} imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/portal/templates/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml index c3856dd339..865d84523f 100644 --- a/kubernetes/portal/templates/portal-widgets-deployment.yaml +++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePortalPortalwidgets }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -64,4 +65,5 @@ spec: hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties 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/robot/templates/all-services.yaml b/kubernetes/robot/templates/all-services.yaml index f126bc9b74..196e7b196a 100644 --- a/kubernetes/robot/templates/all-services.yaml +++ b/kubernetes/robot/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableRobotRobot }} apiVersion: v1 kind: Service metadata: @@ -12,3 +13,4 @@ spec: selector: app: robot type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/robot/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml index da017db6a6..561d795287 100644 --- a/kubernetes/robot/templates/robot-deployment.yaml +++ b/kubernetes/robot/templates/robot-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableRobotRobot }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -79,3 +80,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets/asdc/base_vlb/dnsscaling.env imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdc/templates/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml index 2cd895b45a..4100dc24a4 100644 --- a/kubernetes/sdc/templates/all-services.yaml +++ b/kubernetes/sdc/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdcSdcEs }} apiVersion: v1 kind: Service metadata: @@ -14,6 +15,8 @@ spec: selector: app: sdc-es clusterIP: None +#{{ end }} +#{{ if not .Values.disableSdcSdcCs }} --- apiVersion: v1 kind: Service @@ -31,6 +34,8 @@ spec: selector: app: sdc-cs clusterIP: None +#{{ end }} +#{{ if not .Values.disableSdcSdcKb }} --- apiVersion: v1 kind: Service @@ -46,6 +51,8 @@ spec: selector: app: sdc-kb clusterIP: None +#{{ end }} +#{{ if not .Values.disableSdcSdcBe }} --- apiVersion: v1 kind: Service @@ -85,6 +92,8 @@ spec: selector: app: sdc-be type: NodePort +#{{ end }} +#{{ if not .Values.disableSdcSdcFe }} --- apiVersion: v1 kind: Service @@ -115,3 +124,4 @@ spec: selector: app: sdc-fe type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml index 0ba4db50ce..f38dbd71d9 100644 --- a/kubernetes/sdc/templates/sdc-be.yaml +++ b/kubernetes/sdc/templates/sdc-be.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdcSdcBe }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -135,3 +136,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdc/templates/sdc-cs.yaml b/kubernetes/sdc/templates/sdc-cs.yaml index 844bd20d35..d93ea2d7cf 100644 --- a/kubernetes/sdc/templates/sdc-cs.yaml +++ b/kubernetes/sdc/templates/sdc-cs.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdcSdcCs }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -87,3 +88,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdc/templates/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml index e322ff405a..aff280d838 100644 --- a/kubernetes/sdc/templates/sdc-es.yaml +++ b/kubernetes/sdc/templates/sdc-es.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdcSdcEs }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -61,3 +62,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml index 56d62963c4..d81e567711 100644 --- a/kubernetes/sdc/templates/sdc-fe.yaml +++ b/kubernetes/sdc/templates/sdc-fe.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdcSdcFe }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -122,3 +123,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-fe/FE_2_setup_configuration.rb imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml index 0d77e42d97..1f6f6e8dbf 100644 --- a/kubernetes/sdc/templates/sdc-kb.yaml +++ b/kubernetes/sdc/templates/sdc-kb.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdcSdcKb }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -79,3 +80,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdc/templates/sdc-pv-pvc.yaml b/kubernetes/sdc/templates/sdc-pv-pvc.yaml index d84d8f4a93..c8ce9531c2 100644 --- a/kubernetes/sdc/templates/sdc-pv-pvc.yaml +++ b/kubernetes/sdc/templates/sdc-pv-pvc.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdcSdcCs }} apiVersion: v1 kind: PersistentVolume metadata: @@ -28,3 +29,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-sdc-cs-db" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdnc/templates/all-services.yaml b/kubernetes/sdnc/templates/all-services.yaml index 687a6bb934..37c88ed515 100644 --- a/kubernetes/sdnc/templates/all-services.yaml +++ b/kubernetes/sdnc/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdncSdncDbhost }} apiVersion: v1 kind: Service metadata: @@ -25,6 +26,7 @@ spec: selector: app: sdnc-dbhost clusterIP: None +#{{ end }} --- apiVersion: v1 kind: Service @@ -39,6 +41,7 @@ spec: selector: app: sdnc-dbhost clusterIP: None +#{{ if not .Values.disableSdncSdncDgbuilder }} --- apiVersion: v1 kind: Service @@ -56,6 +59,8 @@ spec: type: NodePort selector: app: sdnc-dgbuilder +#{{ end }} +#{{ if not .Values.disableSdncSdnc }} --- apiVersion: v1 kind: Service @@ -88,6 +93,8 @@ spec: type: NodePort selector: app: sdnc +#{{ end }} +#{{ if not .Values.disableSdncSdncPortal }} --- apiVersion: v1 kind: Service @@ -115,3 +122,4 @@ spec: type: NodePort selector: app: sdnc-portal +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdnc/templates/db-deployment.yaml b/kubernetes/sdnc/templates/db-deployment.yaml index 7bc8a75214..e2723b5e45 100644 --- a/kubernetes/sdnc/templates/db-deployment.yaml +++ b/kubernetes/sdnc/templates/db-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdncSdncDbhost }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -44,3 +45,4 @@ spec: claimName: sdnc-db imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml index 0e2166e92a..2fb4650a50 100644 --- a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml +++ b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdncSdncDgbuilder }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -72,3 +73,4 @@ spec: path: /etc/localtime imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdnc/templates/sdnc-deployment.yaml b/kubernetes/sdnc/templates/sdnc-deployment.yaml index 95c282b602..a9a9c0e155 100644 --- a/kubernetes/sdnc/templates/sdnc-deployment.yaml +++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdncSdnc }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -102,3 +103,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml b/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml index f8fe394907..f45d8f817d 100644 --- a/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml +++ b/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdncSdncDbhost }} apiVersion: v1 kind: PersistentVolume metadata: @@ -28,3 +29,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-sdnc-db" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/sdnc/templates/web-deployment.yaml b/kubernetes/sdnc/templates/web-deployment.yaml index 45e2e26df3..9ab224bad6 100644 --- a/kubernetes/sdnc/templates/web-deployment.yaml +++ b/kubernetes/sdnc/templates/web-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableSdncSdncPortal }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -82,3 +83,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/templates/all-services.yaml index e768fe26ac..9135622116 100644 --- a/kubernetes/uui/templates/all-services.yaml +++ b/kubernetes/uui/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableUuiUui }} apiVersion: v1 kind: Service metadata: @@ -5,6 +6,17 @@ metadata: app: uui name: uui namespace: "{{ .Values.nsPrefix }}-uui" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "usecaseui-gui", + "version": "v1", + "url": "/iui/usecaseui", + "protocol": "UI" + "port": "8080", + "visualRange":"1|0" + } + ]' spec: ports: - name: uui @@ -13,3 +25,4 @@ spec: selector: app: uui type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/uui/templates/uui-deployment.yaml b/kubernetes/uui/templates/uui-deployment.yaml index e23202a907..41d33b194e 100644 --- a/kubernetes/uui/templates/uui-deployment.yaml +++ b/kubernetes/uui/templates/uui-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableUuiUui }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -32,3 +33,4 @@ spec: periodSeconds: 10 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file 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 diff --git a/kubernetes/vid/templates/all-services.yaml b/kubernetes/vid/templates/all-services.yaml index 270aab9fc1..1aa2bb0a0b 100644 --- a/kubernetes/vid/templates/all-services.yaml +++ b/kubernetes/vid/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVidVidMariadb }} apiVersion: v1 kind: Service metadata: @@ -10,6 +11,8 @@ spec: selector: app: vid-mariadb clusterIP: None +#{{ end }} +#{{ if not .Values.disableVidVidServer }} --- apiVersion: v1 kind: Service @@ -26,3 +29,4 @@ spec: selector: app: vid-server type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/vid/templates/vid-mariadb-deployment.yaml b/kubernetes/vid/templates/vid-mariadb-deployment.yaml index 9b585e246f..55ef5da872 100644 --- a/kubernetes/vid/templates/vid-mariadb-deployment.yaml +++ b/kubernetes/vid/templates/vid-mariadb-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVidVidMariadb }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -60,3 +61,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/vid/vid/lf_config/vid-my.cnf imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/vid/templates/vid-pv-pvc.yaml b/kubernetes/vid/templates/vid-pv-pvc.yaml index f568c7a74b..f513a87354 100644 --- a/kubernetes/vid/templates/vid-pv-pvc.yaml +++ b/kubernetes/vid/templates/vid-pv-pvc.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVidVidMariadb }} apiVersion: v1 kind: PersistentVolume metadata: @@ -28,3 +29,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-vid-db" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml index ff341335a3..e8c7f55523 100644 --- a/kubernetes/vid/templates/vid-server-deployment.yaml +++ b/kubernetes/vid/templates/vid-server-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVidVidServer }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -131,3 +132,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/vid/logback.xml imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/vnfsdk/templates/all-services.yaml b/kubernetes/vnfsdk/templates/all-services.yaml index 1f11729667..c78dab8193 100644 --- a/kubernetes/vnfsdk/templates/all-services.yaml +++ b/kubernetes/vnfsdk/templates/all-services.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVnfsdkPostgres }} apiVersion: v1 kind: Service metadata: @@ -12,6 +13,8 @@ spec: selector: app: postgres clusterIP: None +#{{ end }} +#{{ if not .Values.disableVnfsdkRefrepo }} --- apiVersion: v1 kind: Service @@ -28,3 +31,4 @@ spec: selector: app: refrepo type: NodePort +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/vnfsdk/templates/postgres-deployment.yaml b/kubernetes/vnfsdk/templates/postgres-deployment.yaml index 76721d1eae..cdc2ba9572 100644 --- a/kubernetes/vnfsdk/templates/postgres-deployment.yaml +++ b/kubernetes/vnfsdk/templates/postgres-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVnfsdkPostgres }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -22,3 +23,4 @@ spec: name: "postgres" imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml index 3accb96967..82f5f172db 100644 --- a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml +++ b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disableVnfsdkRefrepo }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -52,3 +53,4 @@ spec: periodSeconds: 10 imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key +#{{ end }}
\ No newline at end of file |