summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml18
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties1
-rw-r--r--kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml6
-rw-r--r--kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-fcaps/values.yaml6
-rw-r--r--kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml6
-rw-r--r--kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-starlingx/values.yaml6
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml6
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml3
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/values.yaml6
-rw-r--r--kubernetes/multicloud/templates/service.yaml4
12 files changed, 52 insertions, 14 deletions
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
index f6dcae2cac..4cd2ab56b5 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
@@ -46,6 +46,20 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
{{- if .Values.global.aafEnabled }}
+ - name: {{ include "common.name" . }}-aaf-readiness
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - aaf-locate
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
- name: {{ include "common.name" . }}-dr-node-aaf-config
image: "{{ include "common.repository" . }}/{{ .Values.global.aafAgentImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
@@ -174,12 +188,12 @@ spec:
- name: {{ include "common.fullname" . }}-logs
emptyDir: {}
{{- if not .Values.persistence.enabled }}
- - name: {{ include "common.fullname" . }}-event-logs-pvc
+ - name: {{ include "common.fullname" . }}-event-logs
emptyDir: {}
- name: {{ include "common.fullname" . }}-data
emptyDir: {}
{{- if .Values.global.aafEnabled }}
- - name: {{ include "common.fullname" . }}-aaf-props-pvc
+ - name: {{ include "common.fullname" . }}-aaf-props
emptyDir: {}
{{- end }}
{{- end }}
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
index c7714d33a4..34662ae9e3 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
@@ -50,7 +50,6 @@ org.onap.dmaap.datarouter.provserver.https.include.protocols = TLSv1.1|TLSv1.2
# AAF config
org.onap.dmaap.datarouter.provserver.cadi.enabled = false
-org.onap.dmaap.datarouter.provserver.passwordencryption = PasswordEncryptionKey#@$%^&1234#
org.onap.dmaap.datarouter.provserver.aaf.feed.type = org.onap.dmaap-dr.feed
org.onap.dmaap.datarouter.provserver.aaf.sub.type = org.onap.dmaap-dr.sub
org.onap.dmaap.datarouter.provserver.aaf.instance = legacy
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml
index e2837ef7f0..3f09b08eb8 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml
@@ -40,6 +40,8 @@ spec:
spec:
containers:
- env:
+ - name: MSB_PROTO
+ value: {{ .Values.config.msbprotocol }}.{{ include "common.namespace" . }}
- name: MSB_ADDR
value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
- name: MSB_PORT
@@ -54,6 +56,8 @@ spec:
value: "{{ .Values.config.aai.username }}"
- name: AAI_PASSWORD
value: "{{ .Values.config.aai.password }}"
+ - name: SSL_ENABLED
+ value: "{{ .Values.config.ssl_enabled }}"
name: {{ include "common.name" . }}
volumeMounts:
- mountPath: /var/log/onap
@@ -74,7 +78,7 @@ spec:
httpGet:
path: /api/multicloud-fcaps/v1/healthcheck
port: {{ .Values.service.internalPort }}
- scheme: HTTP
+ scheme: HTTPS
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml
index 75cd4c0dda..fabe32e0ff 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml
@@ -32,6 +32,7 @@ metadata:
"url": "/api/multicloud-fcaps/v0",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
"visualRange": "1"
},
{
@@ -40,6 +41,7 @@ metadata:
"url": "/api/multicloud-fcaps/v1",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
"visualRange": "1"
}
]'
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml b/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml
index 075a196cf8..4b34784ccd 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml
@@ -23,7 +23,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-fcaps:1.4.1
+image: onap/multicloud/openstack-fcaps:1.5.3
pullPolicy: Always
#Istio sidecar injection policy
@@ -31,8 +31,10 @@ istioSidecar: false
# application configuration
config:
+ ssl_enabled: true
+ msbprotocol: https
msbgateway: msb-iag
- msbPort: 80
+ msbPort: 443
aai:
port: 8443
schemaVersion: v13
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
index 1ee8172ae2..e800c81cce 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
@@ -40,6 +40,8 @@ spec:
spec:
containers:
- env:
+ - name: MSB_PROTO
+ value: {{ .Values.config.msbprotocol }}.{{ include "common.namespace" . }}
- name: MSB_ADDR
value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
- name: MSB_PORT
@@ -54,6 +56,8 @@ spec:
value: "{{ .Values.config.aai.username }}"
- name: AAI_PASSWORD
value: "{{ .Values.config.aai.password }}"
+ - name: SSL_ENABLED
+ value: "{{ .Values.config.ssl_enabled }}"
name: {{ include "common.name" . }}
volumeMounts:
- mountPath: /var/log/onap
@@ -76,7 +80,7 @@ spec:
httpGet:
path: /api/multicloud-starlingx/v0/swagger.json
port: {{ .Values.service.internalPort }}
- scheme: HTTP
+ scheme: HTTPS
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml
index 7e01150e31..cf67f106ee 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml
@@ -32,6 +32,7 @@ metadata:
"url": "/api/multicloud-starlingx/v0",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
"visualRange": "1"
},
{
@@ -40,6 +41,7 @@ metadata:
"url": "/api/multicloud-starlingx/v1",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
"visualRange": "1"
}
]'
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml b/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
index 26ecf93367..2dffd1c959 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
@@ -23,7 +23,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-starlingx:1.4.1
+image: onap/multicloud/openstack-starlingx:1.5.3
pullPolicy: Always
#Istio sidecar injection policy
@@ -31,8 +31,10 @@ istioSidecar: false
# application configuration
config:
+ ssl_enabled: true
+ msbprotocol: https
msbgateway: msb-iag
- msbPort: 80
+ msbPort: 443
aai:
port: 8443
schemaVersion: v13
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
index d0af26c0a0..c14d192fc8 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
@@ -49,6 +49,8 @@ spec:
name: artifact-data
containers:
- env:
+ - name: MSB_PROTO
+ value: {{ .Values.config.msbprotocol }}.{{ include "common.namespace" . }}
- name: MSB_ADDR
value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
- name: MSB_PORT
@@ -63,6 +65,8 @@ spec:
value: "{{ .Values.config.aai.username }}"
- name: AAI_PASSWORD
value: "{{ .Values.config.aai.password }}"
+ - name: SSL_ENABLED
+ value: "{{ .Values.config.ssl_enabled }}"
name: {{ include "common.name" . }}
volumeMounts:
- mountPath: /var/log/onap
@@ -85,7 +89,7 @@ spec:
httpGet:
path: /api/multicloud-titaniumcloud/v1/swagger.json
port: {{ .Values.service.internalPort }}
- scheme: HTTP
+ scheme: HTTPS
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
index 43fc99cd90..5a555b3222 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
@@ -33,6 +33,7 @@ metadata:
"url": "/api/multicloud-titanium_cloud/v0",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
"visualRange": "1"
},
{
@@ -41,6 +42,7 @@ metadata:
"url": "/api/multicloud-titaniumcloud/v0",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
"visualRange": "1"
},
{
@@ -49,6 +51,7 @@ metadata:
"url": "/api/multicloud-titaniumcloud/v1",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
"visualRange": "1"
}
]'
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
index abc77260ad..1104fa0696 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
@@ -26,7 +26,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-windriver:1.4.1
+image: onap/multicloud/openstack-windriver:1.5.3
pullPolicy: Always
#Istio sidecar injection policy
@@ -34,8 +34,10 @@ istioSidecar: true
# application configuration
config:
+ ssl_enabled: true
+ msbprotocol: https
msbgateway: msb-iag
- msbPort: 80
+ msbPort: 443
aai:
port: 8443
schemaVersion: v13
diff --git a/kubernetes/multicloud/templates/service.yaml b/kubernetes/multicloud/templates/service.yaml
index 12bbb298b8..3f950db038 100644
--- a/kubernetes/multicloud/templates/service.yaml
+++ b/kubernetes/multicloud/templates/service.yaml
@@ -33,7 +33,7 @@ metadata:
"url": "/api/multicloud/v0",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
- "enable_ssl": "{{ .Values.config.ssl_enabled }}",
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
"visualRange": "1"
},
{
@@ -42,7 +42,7 @@ metadata:
"url": "/api/multicloud/v1",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
- "enable_ssl": "{{ .Values.config.ssl_enabled }}",
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
"visualRange": "1"
}
]'