diff options
| author |   Instrumental <jgonap@stl.gathman.org> | 2020-03-24 17:07:27 -0500 |
|---|---|---|
| committer | Instrumental <jgonap@stl.gathman.org> | 2020-03-26 01:28:32 -0500 |
| commit | 96bf6a2771dfe992fb27bd6361d191d83b6ff605 (patch) | |
| tree | b26581f65d15574fe81f5dfa3e061b93744ef7fd /auth/helm | |
| parent | 48bcfb9d4b03ac3e2e6915f7bdf72599c8794d43 (diff) | |
AAF Services non root, all platforms2.1.20
adjust Agent for JDK 11
Included redoing Config and Agent Init Containers
refit for "hello" (sample)
Issue-ID: AAF-1102
Signed-off-by: Instrumental <jgonap@stl.gathman.org>
Change-Id: Ia957b1ccce34d164580ccb0a6d02d7b800e4887e
Diffstat (limited to 'auth/helm')
| -rw-r--r-- | auth/helm/aaf-hello/templates/aaf-hello.yaml | 16 | ||||
| -rw-r--r-- | auth/helm/aaf/aaf.sh | 4 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-service.yaml | 2 |
3 files changed, 5 insertions, 17 deletions
diff --git a/auth/helm/aaf-hello/templates/aaf-hello.yaml b/auth/helm/aaf-hello/templates/aaf-hello.yaml index a79f39ed..37127c73 100644 --- a/auth/helm/aaf-hello/templates/aaf-hello.yaml +++ b/auth/helm/aaf-hello/templates/aaf-hello.yaml @@ -56,23 +56,11 @@ spec: persistentVolumeClaim: claimName: aaf-hello-pvc initContainers: - - command: - - /bin/sh - - -c - - | - chmod -R 775 /opt/app/osaaf - chown -R 1000:1000 /opt/app/osaaf - image: busybox:1.28 - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: init-sysctl - volumeMounts: - - mountPath: /opt/app/osaaf - name: aaf-hello-vol - name: aaf-hello-config image: "{{ .Values.image.repository }}{{ .Values.service.agentImage }}" imagePullPolicy: IfNotPresent volumeMounts: - - mountPath: "/opt/app/osaaf" + - mountPath: "/opt/app/osaaf/local" name: aaf-hello-vol command: ["bash","-c","exec /opt/app/aaf_config/bin/agent.sh"] env: @@ -106,7 +94,7 @@ spec: imagePullPolicy: IfNotPresent command: ["bash","-c","cd /opt/app/aaf && if [ ! -d /opt/app/osaaf/etc ]; then cp -Rf etc logs /opt/app/osaaf; fi && exec bin/hello"] volumeMounts: - - mountPath: "/opt/app/osaaf" + - mountPath: "/opt/app/osaaf/local" name: aaf-hello-vol ports: - name: aaf-hello diff --git a/auth/helm/aaf/aaf.sh b/auth/helm/aaf/aaf.sh index 2b94c2ff..51a81da5 100644 --- a/auth/helm/aaf/aaf.sh +++ b/auth/helm/aaf/aaf.sh @@ -1,5 +1,5 @@ -. ../../docker/aaf.props -IMAGE=onap/aaf/aaf_config:$VERSION +. ../../docker/d.props +IMAGE=$DOCKER_REPOSITORY/onap/aaf/aaf_config:$VERSION kubectl -n onap run -it --rm aaf-config-$USER --image=$IMAGE --overrides=' { diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml index f4772d67..da1134ac 100644 --- a/auth/helm/aaf/templates/aaf-service.yaml +++ b/auth/helm/aaf/templates/aaf-service.yaml @@ -77,7 +77,7 @@ spec: - name: aaf-config-container image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }} imagePullPolicy: IfNotPresent - command: ["bash","/opt/app/aaf_config/bin/agent.sh"] + command: ["bash","-c","/opt/app/aaf_config/bin/agent.sh"] volumeMounts: - mountPath: "/opt/app/osaaf" name: aaf-config-vol |