aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml3
-rw-r--r--kubernetes/aai/charts/aai-champ/templates/deployment.yaml15
-rw-r--r--kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12bin2556 -> 3591 bytes
-rw-r--r--kubernetes/aai/charts/aai-gizmo/templates/service.yaml3
-rw-r--r--kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaa-app-config.xml14
-rw-r--r--kubernetes/common/cassandra/templates/statefulset.yaml3
-rw-r--r--kubernetes/common/mariadb-galera/templates/statefulset.yaml3
-rw-r--r--kubernetes/common/mongo/templates/pvc.yaml4
-rw-r--r--kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml9
-rw-r--r--kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml3
-rw-r--r--kubernetes/common/mysql/templates/statefulset.yaml3
-rw-r--r--kubernetes/common/postgres/templates/statefulset.yaml3
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml3
-rw-r--r--kubernetes/portal/charts/portal-mariadb/values.yaml2
-rw-r--r--kubernetes/portal/docker/init/mariadb-client/Dockerfile4
-rwxr-xr-xkubernetes/robot/demo-k8s.sh8
-rw-r--r--kubernetes/sdnc/templates/statefulset.yaml3
-rw-r--r--kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml5
18 files changed, 71 insertions, 17 deletions
diff --git a/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml b/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
index 891526bc21..4a8ae39270 100644
--- a/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
+++ b/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
@@ -125,4 +125,7 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
+ selector:
+ matchLabels:
+ release: "{{ .Release.Name }}"
{{- end }}
diff --git a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
index 0c125b126f..4e1866c8b9 100644
--- a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
@@ -31,6 +31,21 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - aai-cassandra
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
diff --git a/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12 b/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12
index dbf4fcacec..7a4979a7a3 100644
--- a/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12
+++ b/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12
Binary files differ
diff --git a/kubernetes/aai/charts/aai-gizmo/templates/service.yaml b/kubernetes/aai/charts/aai-gizmo/templates/service.yaml
index ac34ed9248..a584800bb8 100644
--- a/kubernetes/aai/charts/aai-gizmo/templates/service.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/templates/service.yaml
@@ -29,8 +29,9 @@ spec:
ports:
{{ if .Values.global.installSidecarSecurity }}
{{if eq .Values.service.type "NodePort" -}}
- - port: {{ .Values.global.rproxy.port }}
+ - port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+ targetPort: {{ .Values.global.rproxy.port }}
name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaa-app-config.xml b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaa-app-config.xml
index 3dd78d3cdf..81834eaafc 100644
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaa-app-config.xml
+++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaa-app-config.xml
@@ -80,37 +80,37 @@
<urls>
<pair-key>/auth/**</pair-key>
<!-- <pair-value>authcBasic, roles[admin], dynamicAuthorization</pair-value> -->
- <pair-value>authcBasic, roles[org.onap.appc.odl|odl-admin|*]</pair-value>
+ <pair-value>authcBasic, roles[org.onap.appc.odl|odl-api|*]</pair-value>
</urls>
<urls>
<pair-key>/restconf/config/aaa-cert-mdsal**</pair-key>
<!-- <pair-value>authcBasic, roles[admin]</pair-value> -->
- <pair-value>authcBasic, roles[org.onap.appc.odl|odl-admin|*]</pair-value>
+ <pair-value>authcBasic, roles[org.onap.appc.odl|odl-api|*]</pair-value>
</urls>
<urls>
<pair-key>/restconf/operational/aaa-cert-mdsal**</pair-key>
<!-- <pair-value>authcBasic, roles[admin]</pair-value> -->
- <pair-value>authcBasic, roles[org.onap.appc.odl|odl-admin|*]</pair-value>
+ <pair-value>authcBasic, roles[org.onap.appc.odl|odl-api|*]</pair-value>
</urls>
<urls>
<pair-key>/restconf/operations/aaa-cert-rpc**</pair-key>
<!-- <pair-value>authcBasic, roles[admin]</pair-value> -->
- <pair-value>authcBasic, roles[org.onap.appc.odl|odl-admin|*]</pair-value>
+ <pair-value>authcBasic, roles[org.onap.appc.odl|odl-api|*]</pair-value>
</urls>
<urls>
<pair-key>/restconf/config/aaa-authn-model**</pair-key>
<!-- <pair-value>authcBasic, roles[admin]</pair-value> -->
- <pair-value>authcBasic, roles[org.onap.appc.odl|odl-admin|*]</pair-value>
+ <pair-value>authcBasic, roles[org.onap.appc.odl|odl-api|*]</pair-value>
</urls>
<urls>
<pair-key>/restconf/operational/aaa-authn-model**</pair-key>
<!-- <pair-value>authcBasic, roles[admin]</pair-value> -->
- <pair-value>authcBasic, roles[org.onap.appc.odl|odl-admin|*]</pair-value>
+ <pair-value>authcBasic, roles[org.onap.appc.odl|odl-api|*]</pair-value>
</urls>
<urls>
<pair-key>/restconf/operations/cluster-admin**</pair-key>
<!-- <pair-value>authcBasic, roles[admin]</pair-value> -->
- <pair-value>authcBasic, roles[org.onap.appc.odl|odl-admin|*]</pair-value>
+ <pair-value>authcBasic, roles[org.onap.appc.odl|odl-api|*]</pair-value>
</urls>
<urls>
<pair-key>/**</pair-key>
diff --git a/kubernetes/common/cassandra/templates/statefulset.yaml b/kubernetes/common/cassandra/templates/statefulset.yaml
index b6bd8f6aa7..960d97ed52 100644
--- a/kubernetes/common/cassandra/templates/statefulset.yaml
+++ b/kubernetes/common/cassandra/templates/statefulset.yaml
@@ -143,4 +143,7 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
+ selector:
+ matchLabels:
+ release: "{{ .Release.Name }}"
{{- end }}
diff --git a/kubernetes/common/mariadb-galera/templates/statefulset.yaml b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
index d3bad4f5b6..2266bfc4e2 100644
--- a/kubernetes/common/mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
@@ -126,4 +126,7 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
+ selector:
+ matchLabels:
+ name: {{ include "common.fullname" . }}
{{- end }}
diff --git a/kubernetes/common/mongo/templates/pvc.yaml b/kubernetes/common/mongo/templates/pvc.yaml
index d1558f131f..372c106800 100644
--- a/kubernetes/common/mongo/templates/pvc.yaml
+++ b/kubernetes/common/mongo/templates/pvc.yaml
@@ -25,6 +25,7 @@ metadata:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
+ name: {{ include "common.fullname" . }}
{{- if .Values.persistence.annotations }}
annotations:
{{ toYaml .Values.persistence.annotations | indent 4 }}
@@ -35,5 +36,8 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size }}
+ selector:
+ matchLabels:
+ name: {{ include "common.fullname" . }}
storageClassName: "{{ include "common.fullname" . }}-data"
{{- end -}}
diff --git a/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml b/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
index 103b1df1c1..009c40dbcc 100644
--- a/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
+++ b/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
@@ -103,7 +103,7 @@ spec:
fieldRef:
fieldPath: status.podIP
volumeMounts:
- - name: cassandra-data
+ - name: {{ template "common.name" . }}-data
mountPath: /var/lib/cassandra
resources:
{{ toYaml .Values.resources | indent 10 }}
@@ -112,12 +112,12 @@ spec:
hostPath:
path: /etc/localtime
{{- if not .Values.persistence.enabled }}
- - name: cassandra-data
+ - name: {{ template "common.name" . }}-data
emptyDir: {}
{{- else }}
volumeClaimTemplates:
- metadata:
- name: cassandra-data
+ name: {{ template "common.name" . }}-data
labels:
app: {{ template "common.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -132,4 +132,7 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
+ selector:
+ matchLabels:
+ release: "{{ .Release.Name }}"
{{- end }}
diff --git a/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml b/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
index 1efd46657c..135b59e2b6 100644
--- a/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
+++ b/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
@@ -185,4 +185,7 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
+ selector:
+ matchLabels:
+ release: "{{ .Release.Name }}"
{{- end }}
diff --git a/kubernetes/common/mysql/templates/statefulset.yaml b/kubernetes/common/mysql/templates/statefulset.yaml
index 1744940868..f73b10f460 100644
--- a/kubernetes/common/mysql/templates/statefulset.yaml
+++ b/kubernetes/common/mysql/templates/statefulset.yaml
@@ -251,4 +251,7 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size }}
+ selector:
+ matchLabels:
+ name: {{ include "common.fullname" . }}
{{ end }}
diff --git a/kubernetes/common/postgres/templates/statefulset.yaml b/kubernetes/common/postgres/templates/statefulset.yaml
index 3c7ae65e4a..db4a256f12 100644
--- a/kubernetes/common/postgres/templates/statefulset.yaml
+++ b/kubernetes/common/postgres/templates/statefulset.yaml
@@ -149,4 +149,7 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size }}
+ selector:
+ matchLabels:
+ name: {{ include "common.fullname" . }}
#{{ end }}
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml b/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
index 3e20e37dd4..5a5b220e61 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
@@ -113,3 +113,6 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size }}
+ selector:
+ matchLabels:
+ name: {{ include "common.fullname" . }}
diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index 0579f278f8..c9acba5d9f 100644
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -28,7 +28,7 @@ image: onap/portal-db:2.3.0
pullPolicy: Always
readinessImage: readiness-check:2.0.0
-mariadbInitImage: "mariadb-client-init:2.0.0"
+mariadbInitImage: "mariadb-client-init:3.0.0"
# application configuration
config:
diff --git a/kubernetes/portal/docker/init/mariadb-client/Dockerfile b/kubernetes/portal/docker/init/mariadb-client/Dockerfile
index 33ca4b11b6..5eb5ad1843 100644
--- a/kubernetes/portal/docker/init/mariadb-client/Dockerfile
+++ b/kubernetes/portal/docker/init/mariadb-client/Dockerfile
@@ -14,14 +14,14 @@
FROM boxfuse/flyway:5.0.7-alpine
-ARG branch=release-2.3.0
+ARG branch=master
ENV no_proxy "localhost,127.0.0.1,.cluster.local,$KUBERNETES_SERVICE_HOST"
# Setup Corporate proxy
ENV https_proxy ${HTTP_PROXY}
ENV http_proxy ${HTTPS_PROXY}
RUN apk add --update \
- mariadb-client=10.1.28-r1 \
+ mariadb-client=10.1.32-r0 \
git \
&& rm -rf /var/cache/apk/*
diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 3fe511f478..79d545b2be 100755
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -45,7 +45,7 @@ function usage
echo " demo.sh <namespace> deleteVNF <module_name from instantiateVFW>"
echo " - Delete the module created by instantiateVFW"
echo " "
- echo " demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service>"
+ echo " demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
echo " - Run heatbridge against the stack for the given service instance and service"
}
@@ -149,8 +149,8 @@ do
heatbridge)
TAG="heatbridge"
shift
- if [ $# -ne 3 ];then
- echo "Usage: demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service>"
+ if [ $# -ne 4 ];then
+ echo "Usage: demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
exit
fi
VARIABLES="$VARIABLES -v HB_STACK:$1"
@@ -159,6 +159,8 @@ do
shift
VARIABLES="$VARIABLES -v HB_SERVICE:$1"
shift
+ VARIABLES="$VARIABLES -v HB_IPV4_OAM_ADDRESS:$1"
+ shift
;;
cds)
TAG="cds"
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 32d98840f7..b30ef38bb8 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -195,4 +195,7 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size }}
+ selector:
+ matchLabels:
+ name: {{ include "common.fullname" . }}
{{ end }}
diff --git a/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml b/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
index 0c77a17261..e90b1564e8 100644
--- a/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
@@ -120,6 +120,8 @@ spec:
volumeClaimTemplates:
- metadata:
name: {{ include "common.fullname" . }}-data
+ labels:
+ name: {{ include "common.fullname" . }}
annotations:
{{- if .Values.persistence.storageClass }}
volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
@@ -132,4 +134,7 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
+ selector:
+ matchLabels:
+ name: {{ include "common.fullname" . }}
{{- end }}