From: garciadeblas Date: Thu, 22 Aug 2024 17:46:53 +0000 (+0200) Subject: Fix image tag in helm chart and installer sripts X-Git-Tag: v16.0.0^0 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=8b95706022edcb3b0688d149c5387a0a2992c2ec;p=osm%2Fdevops.git Fix image tag in helm chart and installer sripts Change-Id: I960ecd79db4a37a3f8c71b35169cbdc6e657c1d5 Signed-off-by: garciadeblas --- diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index a809215a..061aba96 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -219,8 +219,8 @@ EOF" # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set nbi.useOsmSecret=false" OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.repositoryBase=${DOCKER_REGISTRY_URL}${DOCKER_USER}" - [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set-string global.image.tag=${OSM_DOCKER_TAG}" - [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.server.sidecarContainers.prometheus-config-sidecar.image=${DOCKER_REGISTRY_URL}${DOCKER_USER}/prometheus:${OSM_DOCKER_TAG}" + [ ! "$OSM_DOCKER_TAG" == "16" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set-string global.image.tag=${OSM_DOCKER_TAG}" + [ ! "$OSM_DOCKER_TAG" == "16" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.server.sidecarContainers.prometheus-config-sidecar.image=${DOCKER_REGISTRY_URL}${DOCKER_USER}/prometheus:${OSM_DOCKER_TAG}" OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.hostname=${OSM_DEFAULT_IP}.nip.io" OSM_HELM_OPTS="${OSM_HELM_OPTS} --set grafana.ingress.hosts={grafana.${OSM_DEFAULT_IP}.nip.io}" @@ -725,8 +725,8 @@ ASSUME_YES="" APT_PROXY_URL="" K8S_CLUSTER_ENGINE="k3s" DEBUG_INSTALL="" -RELEASE="testing-daily" -REPOSITORY="testing" +RELEASE="ReleaseSIXTEEN" +REPOSITORY="stable" INSTALL_K8S_MONITOR="" INSTALL_NGSA="y" INSTALL_PLA="" @@ -765,7 +765,7 @@ OSM_WORK_DIR="/etc/osm" OSM_HELM_WORK_DIR="${OSM_WORK_DIR}/helm" OSM_HOST_VOL="/var/lib/osm" OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_NAMESPACE}" -OSM_DOCKER_TAG="testing-daily" +OSM_DOCKER_TAG="16" DOCKER_USER=opensourcemano PULL_IMAGES="y" KAFKA_TAG=2.11-1.0.2 diff --git a/installers/helm/osm/values.yaml b/installers/helm/osm/values.yaml index af9f71ac..3c648f19 100644 --- a/installers/helm/osm/values.yaml +++ b/installers/helm/osm/values.yaml @@ -27,7 +27,7 @@ global: repositoryBase: docker.io/opensourcemano pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "testing-daily" + tag: "16" imagePullSecrets: [] nameOverride: "" @@ -210,7 +210,7 @@ keystone: port: 5000 image: {} # repository: opensourcemano/keystone - # tag: "testing-daily" + # tag: "16" # replicaCount: 1 useOsmSecret: true # secretName: "keystone-secret" @@ -220,7 +220,7 @@ lcm: logLevel: DEBUG image: {} # repository: opensourcemano/lcm - # tag: "testing-daily" + # tag: "16" # replicaCount: 1 useOsmSecret: true # secretName: "lcm-secret" @@ -242,7 +242,7 @@ mon: # logLevel: DEBUG image: {} # repository: opensourcemano/mon - # tag: "testing-daily" + # tag: "16" # replicaCount: 1 useOsmSecret: true # secretName: "mon-secret" @@ -265,7 +265,7 @@ nbi: # nodePort: 9999 image: {} # repository: opensourcemano/nbi - # tag: "testing-daily" + # tag: "16" # replicaCount: 1 useOsmSecret: true # secretName: "nbi-secret" @@ -280,7 +280,7 @@ ngui: # host: .nip.io image: {} # repository: opensourcemano/ng-ui - # tag: "testing-daily" + # tag: "16" # replicaCount: 1 # pla module is disabled by default unless global.oldServiceAssurance and pla.enabled are set to true @@ -289,7 +289,7 @@ pla: # logLevel: DEBUG image: {} # repository: opensourcemano/pla - # tag: "testing-daily" + # tag: "16" # replicaCount: 1 # pol module is disabled by default unless global.oldServiceAssurance and pol.enabled are set to true @@ -298,7 +298,7 @@ pol: # logLevel: DEBUG image: {} # repository: opensourcemano/pol - # tag: "testing-daily" + # tag: "16" # replicaCount: 1 useOsmSecret: true # secretName: "pol-secret" @@ -334,7 +334,7 @@ prometheus: # readOnlyRootFilesystem: true allowPrivilegeEscalation: false # runAsNonRoot: true - image: opensourcemano/prometheus:testing-daily + image: opensourcemano/prometheus:16 imagePullPolicy: IfNotPresent command: ["/bin/sh", "-c"] args: ["sleep 50; python -u ./app.py"] @@ -537,7 +537,7 @@ ro: port: 9090 image: {} # repository: opensourcemano/ro - # tag: "testing-daily" + # tag: "16" # replicaCount: 1 useOsmSecret: true # secretName: "ro-secret" @@ -554,7 +554,7 @@ webhookTranslator: # replicaCount: 1 image: {} # repository: opensourcemano/webhook - # tag: "testing-daily" + # tag: "16" ingress: {} # host: webhook..nip.io # replicaCount: 1 diff --git a/installers/helm/values/airflow-values.yaml b/installers/helm/values/airflow-values.yaml index bcfe583c..1b67a185 100644 --- a/installers/helm/values/airflow-values.yaml +++ b/installers/helm/values/airflow-values.yaml @@ -13,7 +13,7 @@ # --- defaultAirflowRepository: opensourcemano/airflow -defaultAirflowTag: "testing-daily" +defaultAirflowTag: "16" ingress: web: enabled: True diff --git a/installers/install_mongodb.sh b/installers/install_mongodb.sh index 213d2f45..f1767d83 100755 --- a/installers/install_mongodb.sh +++ b/installers/install_mongodb.sh @@ -74,7 +74,7 @@ done DEBUG_INSTALL=${DEBUG_INSTALL:-} OSM_DEVOPS=${OSM_DEVOPS:-"/usr/share/osm-devops"} -OSM_DOCKER_TAG=${OSM_DOCKER_TAG:-"testing-daily"} +OSM_DOCKER_TAG=${OSM_DOCKER_TAG:-"16"} OSM_HELM_WORK_DIR=${OSM_HELM_WORK_DIR:-"/etc/osm/helm"} OSM_NAMESPACE=${OSM_NAMESPACE:-"osm"} DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-} diff --git a/installers/install_ngsa.sh b/installers/install_ngsa.sh index 69314327..93d58f1c 100755 --- a/installers/install_ngsa.sh +++ b/installers/install_ngsa.sh @@ -84,7 +84,7 @@ done DEBUG_INSTALL=${DEBUG_INSTALL:-} DEFAULT_IP=${DEFAULT_IP:-"127.0.0.1"} OSM_DEVOPS=${OSM_DEVOPS:-"/usr/share/osm-devops"} -OSM_DOCKER_TAG=${OSM_DOCKER_TAG:-"testing-daily"} +OSM_DOCKER_TAG=${OSM_DOCKER_TAG:-"16"} OSM_HELM_WORK_DIR=${OSM_HELM_WORK_DIR:-"/etc/osm/helm"} OSM_NAMESPACE=${OSM_NAMESPACE:-"osm"} DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-} diff --git a/installers/install_osm.sh b/installers/install_osm.sh index ba116cc4..4c59a3e1 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -15,7 +15,7 @@ REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian RELEASE=ReleaseSIXTEEN REPOSITORY=stable -DOCKER_TAG="testing-daily" +DOCKER_TAG="16" DEVOPS_PATH=/usr/share/osm-devops function usage(){