diff options
| -rw-r--r-- | kubernetes/aai/charts/aai-champ/templates/deployment.yaml | 15 | ||||
| -rw-r--r-- | kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12 | bin | 2556 -> 3591 bytes | |||
| -rw-r--r-- | kubernetes/aai/charts/aai-gizmo/templates/service.yaml | 3 | ||||
| -rwxr-xr-x | kubernetes/robot/demo-k8s.sh | 8 |
4 files changed, 22 insertions, 4 deletions
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 Binary files differindex 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 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/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" |