From 9ed8818a3833973d754030f8043c73b582cd437d Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Fri, 2 Aug 2019 07:13:20 -0400 Subject: [PATCH] Fetch and run get-helm script in two steps Sometimes curl times out but that did not fail the job; now it will. Signed-off-by: Lott, Christopher (cl778h) Change-Id: I64ca83aa7d76a455a141036ab0144a88db8050ce --- bin/verify-ric-charts | 4 +- ci/Dockerfile | 4 +- .../helm/ves/templates/ves-deployment.yaml | 158 ++++++++++----------- .../80-Auxiliary-Functions/helm/ves/values.yaml | 2 +- 4 files changed, 85 insertions(+), 83 deletions(-) diff --git a/bin/verify-ric-charts b/bin/verify-ric-charts index fa4d6904..1f2ae499 100755 --- a/bin/verify-ric-charts +++ b/bin/verify-ric-charts @@ -38,8 +38,8 @@ echo "***************************************" for dir in "${CHART_ARRAY[@]}" do - rm -r $dir/charts - rm -r $dir/tmpcharts + rm -rf $dir/charts + rm -rf $dir/tmpcharts mkdir -p $dir/charts cp $TEMP_DIR/ric-common*.tgz $dir/charts/ diff --git a/ci/Dockerfile b/ci/Dockerfile index bd60013b..cd5ad000 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -18,7 +18,9 @@ FROM ubuntu:18.04 RUN apt-get update && apt-get -y install curl -RUN curl -L https://git.io/get_helm.sh | bash +ARG GH=get_helm.sh +RUN curl --silent --show-error -L https://git.io/${GH} -o ${GH} +RUN bash ${GH} RUN helm init -c ARG TGT=/tmp/it-dep COPY . $TGT diff --git a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml index 05040f8d..41751f34 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml @@ -1,80 +1,80 @@ -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ - - - -kind: Deployment -apiVersion: extensions/v1beta1 -metadata: - name: {{ include "common.deploymentname.ves" . }} - generation: 1 - labels: - app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: - deployment.kubernetes.io/revision: '1' -spec: - replicas: {{ .Values.ves.replicaCount }} - selector: - matchLabels: - app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }} - release: {{ .Release.Name }} - template: - metadata: - labels: - app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }} - release: {{ .Release.Name }} - spec: - hostname: {{ include "common.name.ves" . }} - volumes: - - name: component-log - emptyDir: {} - - name: dmaap-config-file - configMap: - name: {{ include "common.configmapname.ves" . }} - imagePullPolicy: {{ include "common.pullPolicy" . }} - imagePullSecrets: - - name: onap-docker-registry-key - containers: - - name: {{ include "common.containername.ves" . }} - image: {{ .Values.ves.onapRepository }}/{{ .Values.ves.image.name }}:{{ .Values.ves.image.tag }} - ports: - - containerPort: {{ include "common.serviceport.ves.http.container" . }} - protocol: TCP - - containerPort: {{ include "common.serviceport.ves.https.container" . }} - protocol: TCP - volumeMounts: - - name: component-log - mountPath: "/opt/app/VESCollector/logs/ecomp" - - name: dmaap-config-file - mountPath: "/opt/app/VESCollector/etc/DmaapConfig.json" - subPath: DMaapConfig.json - readinessProbe: - httpGet: - path: "/healthcheck" - port: {{ include "common.serviceport.ves.http.container" . }} - scheme: HTTP - initialDelaySeconds: 5 - timeoutSeconds: 1 - periodSeconds: 15 - successThreshold: 1 - failureThreshold: 1 - terminationMessagePath: "/dev/termination-log" - terminationMessagePolicy: File +################################################################################ +# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2019 Nokia. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you may not use this file except in compliance with the License. # +# You may obtain a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +################################################################################ + + + +kind: Deployment +apiVersion: extensions/v1beta1 +metadata: + name: {{ include "common.deploymentname.ves" . }} + generation: 1 + labels: + app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + annotations: + deployment.kubernetes.io/revision: '1' +spec: + replicas: {{ .Values.ves.replicaCount }} + selector: + matchLabels: + app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }} + release: {{ .Release.Name }} + template: + metadata: + labels: + app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }} + release: {{ .Release.Name }} + spec: + hostname: {{ include "common.name.ves" . }} + volumes: + - name: component-log + emptyDir: {} + - name: dmaap-config-file + configMap: + name: {{ include "common.configmapname.ves" . }} + imagePullSecrets: + - name: onap-docker-registry-key + containers: + - name: {{ include "common.containername.ves" . }} + image: {{ .Values.ves.onapRepository }}/{{ .Values.ves.image.name }}:{{ .Values.ves.image.tag }} + imagePullPolicy: {{ include "common.pullPolicy" . }} + ports: + - containerPort: {{ include "common.serviceport.ves.http.container" . }} + protocol: TCP + - containerPort: {{ include "common.serviceport.ves.https.container" . }} + protocol: TCP + volumeMounts: + - name: component-log + mountPath: "/opt/app/VESCollector/logs/ecomp" + - name: dmaap-config-file + mountPath: "/opt/app/VESCollector/etc/DmaapConfig.json" + subPath: DMaapConfig.json + readinessProbe: + httpGet: + path: "/healthcheck" + port: {{ include "common.serviceport.ves.http.container" . }} + scheme: HTTP + initialDelaySeconds: 5 + timeoutSeconds: 1 + periodSeconds: 15 + successThreshold: 1 + failureThreshold: 1 + terminationMessagePath: "/dev/termination-log" + terminationMessagePolicy: File restartPolicy: Always \ No newline at end of file diff --git a/ric-aux/80-Auxiliary-Functions/helm/ves/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/ves/values.yaml index b193e0bc..41c24bab 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/ves/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/ves/values.yaml @@ -20,9 +20,9 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +imagePullPolicy: IfNotPresent ves: onapRepository: "nexus3.onap.org:10001" - imagePullPolicy: IfNotPresent image: name: onap/org.onap.dcaegen2.collectors.ves.vescollector -- 2.16.6