From a55fdb173b6a494f054c9b2599fbbbc83cbabf7c Mon Sep 17 00:00:00 2001 From: dgiannopoulos Date: Thu, 8 Feb 2024 19:15:13 +0200 Subject: [PATCH 01/11] fix: used the correct images instead of dockerhub --- kubernetes/helm/openslice/values.yaml | 36 +++++++++++++-------------- kubernetes/template/bugzilla.yaml | 2 +- kubernetes/template/centrallog.yaml | 2 +- kubernetes/template/manoclient.yaml | 2 +- kubernetes/template/oasapi.yaml | 2 +- kubernetes/template/osom.yaml | 2 +- kubernetes/template/osportalapi.yaml | 2 +- kubernetes/template/osscapi.yaml | 2 +- kubernetes/template/portalweb.yaml | 2 +- kubernetes/template/tmfweb.yaml | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index 24f52b6..7ec3d05 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -16,15 +16,15 @@ image: # Overrides the image tag whose default is the chart appVersion. tag: "latest" bugzilla: - repository: openslice/org.etsi.osl.bugzilla + repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" centrallog: - repository: openslice/org.etsi.osl.centrallog.service + repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" keycloak: repository: jboss/keycloak pullPolicy: IfNotPresent @@ -36,45 +36,45 @@ image: # Overrides the image tag whose default is the chart appVersion. tag: "latest" manoclient: - repository: openslice/org.etsi.osl.mano + repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" osom: - repository: openslice/org.etsi.osl.osom + repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" portalapi: - repository: openslice/org.etsi.osl.portal.api + repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" osscapi: - repository: openslice/org.etsi.osl.tmf.api + repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" mysql: repository: mysql pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "5.7.43" oasapi: - repository: openslice/org.etsi.osl.oas + repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" portalweb: - repository: openslice/org.etsi.osl.portal.web + repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" tmfweb: - repository: openslice/org.etsi.osl.tmf.web + repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "latest" + tag: "develop" bugzillaurl: example.com:443/bugzilla bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z diff --git a/kubernetes/template/bugzilla.yaml b/kubernetes/template/bugzilla.yaml index fe5c189..658d102 100644 --- a/kubernetes/template/bugzilla.yaml +++ b/kubernetes/template/bugzilla.yaml @@ -27,7 +27,7 @@ spec: "bugzillakey":"", "main_operations_product":"" } - image: openslice/org.etsi.osl.bugzilla:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop name: bugzilla ports: - containerPort: 13010 diff --git a/kubernetes/template/centrallog.yaml b/kubernetes/template/centrallog.yaml index f4c9020..2fa6b27 100644 --- a/kubernetes/template/centrallog.yaml +++ b/kubernetes/template/centrallog.yaml @@ -25,7 +25,7 @@ spec: "spring.activemq.password": "artemis", "centrallogurl":"http://elk_ip:elk_port/index_name/_doc" } - image: openslice/org.etsi.osl.centrallog.service:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop name: centrallog ports: - containerPort: 13013 diff --git a/kubernetes/template/manoclient.yaml b/kubernetes/template/manoclient.yaml index 824f3b0..5c181dc 100644 --- a/kubernetes/template/manoclient.yaml +++ b/kubernetes/template/manoclient.yaml @@ -25,7 +25,7 @@ spec: "spring.activemq.password": "artemis", "logging.level.org.springframework" : "INFO" } - image: openslice/org.etsi.osl.mano:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop name: manoclient ports: - containerPort: 13011 diff --git a/kubernetes/template/oasapi.yaml b/kubernetes/template/oasapi.yaml index 8b1706a..f494e3e 100644 --- a/kubernetes/template/oasapi.yaml +++ b/kubernetes/template/oasapi.yaml @@ -46,7 +46,7 @@ spec: "spring.activemq.password": "artemis", "logging.level.org.springframework" : "INFO" } - image: openslice/org.etsi.osl.oas:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop name: openslice-oasapi ports: - containerPort: 13101 diff --git a/kubernetes/template/osom.yaml b/kubernetes/template/osom.yaml index 800dd62..d05010e 100644 --- a/kubernetes/template/osom.yaml +++ b/kubernetes/template/osom.yaml @@ -27,7 +27,7 @@ spec: "spring.activemq.password": "artemis", "logging.level.org.springframework" : "INFO" } - image: openslice/org.etsi.osl.osom:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop name: openslice-osom ports: - containerPort: 13100 diff --git a/kubernetes/template/osportalapi.yaml b/kubernetes/template/osportalapi.yaml index dc4a598..1699579 100644 --- a/kubernetes/template/osportalapi.yaml +++ b/kubernetes/template/osportalapi.yaml @@ -27,7 +27,7 @@ spec: command: ['sh', '-c', "until nslookup mysql; do echo waiting for mysql; sleep 2; done"] containers: - name: openslice-portalapi - image: openslice/org.etsi.osl.portal.api:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop ports: - containerPort: 13000 volumeMounts: diff --git a/kubernetes/template/osscapi.yaml b/kubernetes/template/osscapi.yaml index 730e027..720c922 100644 --- a/kubernetes/template/osscapi.yaml +++ b/kubernetes/template/osscapi.yaml @@ -48,7 +48,7 @@ spec: "logging.level.org.springframework":"INFO", "kroki.serverurl":"http://INGRESSADDR/kroki" } - image: openslice/org.etsi.osl.tmf.api:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop name: openslice-scapi ports: - containerPort: 13082 diff --git a/kubernetes/template/portalweb.yaml b/kubernetes/template/portalweb.yaml index 630075e..92106a9 100644 --- a/kubernetes/template/portalweb.yaml +++ b/kubernetes/template/portalweb.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: openslice-portalweb - image: openslice/org.etsi.osl.portal.web:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web:develop ports: - containerPort: 80 volumeMounts: diff --git a/kubernetes/template/tmfweb.yaml b/kubernetes/template/tmfweb.yaml index 9929563..a07b188 100644 --- a/kubernetes/template/tmfweb.yaml +++ b/kubernetes/template/tmfweb.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: openslice-tmfweb - image: openslice/org.etsi.osl.tmf.web:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web:develop ports: - containerPort: 80 volumeMounts: -- GitLab From 705c3f13bc5936584ddd2f2a9b456d0d53667e42 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Tue, 13 Feb 2024 13:20:02 +0000 Subject: [PATCH 02/11] fix: used images from gitlab registry --- compose/docker-compose.yaml.configure | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index 0f96e53..c4c1c4a 100644 --- a/compose/docker-compose.yaml.configure +++ b/compose/docker-compose.yaml.configure @@ -86,7 +86,7 @@ services: build: context: ../../org.etsi.osl.portal.api/ dockerfile: Dockerfile - image: org.etsi.osl.portal.api:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop environment: SPRING_APPLICATION_JSON: '{ "origins": "http://localhost", @@ -133,7 +133,7 @@ services: build: context: ../../org.etsi.osl.mano/ dockerfile: Dockerfile - image: org.etsi.osl.mano:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", @@ -159,7 +159,7 @@ services: build: context: ../../org.etsi.osl.bugzilla/ dockerfile: Dockerfile - image: org.etsi.osl.bugzilla:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", @@ -185,7 +185,7 @@ services: build: context: ../../org.etsi.osl.tmf.api/ dockerfile: Dockerfile - image: org.etsi.osl.tmf.api:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop environment: SPRING_APPLICATION_JSON: '{ "origins": "http://localhost", @@ -226,7 +226,7 @@ services: build: context: ../../org.etsi.osl.osom/ dockerfile: Dockerfile - image: org.etsi.osl.osom:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", @@ -252,7 +252,7 @@ services: build: context: ../../org.etsi.osl.oas/ dockerfile: Dockerfile - image: org.etsi.osl.oas:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop environment: SPRING_APPLICATION_JSON: '{ "origins": "http://localhost", @@ -289,7 +289,7 @@ services: build: context: ../../org.etsi.osl.cridge/ dockerfile: Dockerfile - image: org.etsi.osl.cridge:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", @@ -328,7 +328,7 @@ services: build: context: ../../org.etsi.osl.centrallog.service/ dockerfile: Dockerfile - image: org.etsi.osl.centrallog.service:latest + image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop environment: SPRING_APPLICATION_JSON: '{ "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", -- GitLab From eb855ffb3e22b9692105aedcafddf7d44a989df0 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Tue, 13 Feb 2024 13:36:15 +0000 Subject: [PATCH 03/11] feat: removed skipTests, fixed version --- ci-templates/build.yml | 2 +- ci-templates/build_unprotected.yml | 2 +- ci-templates/default.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-templates/build.yml b/ci-templates/build.yml index bd5d893..4d10538 100644 --- a/ci-templates/build.yml +++ b/ci-templates/build.yml @@ -3,7 +3,7 @@ stage: build image: maven:3.9.5-ibm-semeru-17-focal script: - - mvn deploy -s ci_settings.xml -DskipTests -Dversion=$APP_VERSION + - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION artifacts: paths: - target/ diff --git a/ci-templates/build_unprotected.yml b/ci-templates/build_unprotected.yml index 369d8d9..a5c8669 100644 --- a/ci-templates/build_unprotected.yml +++ b/ci-templates/build_unprotected.yml @@ -3,7 +3,7 @@ stage: build image: maven:3.9.5-ibm-semeru-17-focal script: - - mvn install -s ci_settings.xml -DskipTests + - mvn install -s ci_settings.xml artifacts: paths: - target/ diff --git a/ci-templates/default.yml b/ci-templates/default.yml index 8b0f900..95386c2 100644 --- a/ci-templates/default.yml +++ b/ci-templates/default.yml @@ -7,7 +7,7 @@ stages: .default: variables: - DEFAULT_VERSION: "1.2.0-SNAPSHOT" + DEFAULT_VERSION: "1.0.0-SNAPSHOT" before_script: - | if [ "$CI_COMMIT_REF_NAME" = "main" ] && [ -n "$CI_COMMIT_TAG" ]; then -- GitLab From 8459ae78fb4b82f9ec1e02bc314c1c0a4d35e5ac Mon Sep 17 00:00:00 2001 From: trantzas Date: Wed, 27 Mar 2024 17:25:27 +0000 Subject: [PATCH 04/11] Updated the keycloak image from jboss to quay.io --- compose/docker-compose.yaml.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index c4c1c4a..9e8b395 100644 --- a/compose/docker-compose.yaml.configure +++ b/compose/docker-compose.yaml.configure @@ -52,7 +52,7 @@ services: keycloak: container_name: keycloak - image: jboss/keycloak:16.1.1 + image: quay.io/keycloak/keycloak:16.1.1 restart: always profiles: ["dev", "prod"] environment: -- GitLab From 4520024ec568c06e1fd5760b91627d2bea2b1dc6 Mon Sep 17 00:00:00 2001 From: trantzas Date: Fri, 5 Apr 2024 13:35:15 +0000 Subject: [PATCH 05/11] Enabled log rotation in TMF container --- compose/docker-compose.yaml.configure | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index 9e8b395..b74764a 100644 --- a/compose/docker-compose.yaml.configure +++ b/compose/docker-compose.yaml.configure @@ -208,6 +208,11 @@ services: "kroki.serverurl" : "http://localhost/kroki", "server.forward-headers-strategy":"FRAMEWORK" }' + logging: + driver: "json-file" + options: + max-size: "1g" + max-file: "3" volumes: - ./repo:/root ports: -- GitLab From 7f5a096080308e7a390439f22cc0057c72bf805c Mon Sep 17 00:00:00 2001 From: dgiannopoulos Date: Fri, 12 Apr 2024 10:39:28 +0300 Subject: [PATCH 06/11] feat: added cridge to helm chart --- .../files/org.etsi.osl.cridge/kubeconfig.yaml | 19 ++++++ .../openslice/templates/cridge-config.yaml | 13 ++++ .../helm/openslice/templates/cridge.yaml | 61 +++++++++++++++++++ .../helm/openslice/templates/portalweb.yaml | 4 ++ kubernetes/helm/openslice/values.yaml | 8 +++ 5 files changed, 105 insertions(+) create mode 100644 kubernetes/helm/openslice/files/org.etsi.osl.cridge/kubeconfig.yaml create mode 100644 kubernetes/helm/openslice/templates/cridge-config.yaml create mode 100644 kubernetes/helm/openslice/templates/cridge.yaml diff --git a/kubernetes/helm/openslice/files/org.etsi.osl.cridge/kubeconfig.yaml b/kubernetes/helm/openslice/files/org.etsi.osl.cridge/kubeconfig.yaml new file mode 100644 index 0000000..1176403 --- /dev/null +++ b/kubernetes/helm/openslice/files/org.etsi.osl.cridge/kubeconfig.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Config +clusters: +- name: development-cluster + cluster: + certificate-authority: path/to/ca.crt # Path to certificate authority file + server: https://123.45.67.89:6443 # Cluster API server address +contexts: +- name: dev-user@development-cluster + context: + cluster: development-cluster + namespace: development # Default namespace + user: dev-user +current-context: dev-user@development-cluster +users: +- name: dev-user + user: + client-certificate: path/to/cert.crt # Path to the client certificate + client-key: path/to/key.key # Path to the client key diff --git a/kubernetes/helm/openslice/templates/cridge-config.yaml b/kubernetes/helm/openslice/templates/cridge-config.yaml new file mode 100644 index 0000000..d6611dc --- /dev/null +++ b/kubernetes/helm/openslice/templates/cridge-config.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: {{ .Release.Namespace }} + labels: + app: {{ include "openslice.fullname" . }} + org.etsi.osl.service: cridge + chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + {{- include "openslice.labels" . | nindent 4 }} + name: {{ include "openslice.fullname" . }}-cridge-kubeconfig +data: + kubeconfig: |- + {{ .Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml" | indent 4 }} diff --git a/kubernetes/helm/openslice/templates/cridge.yaml b/kubernetes/helm/openslice/templates/cridge.yaml new file mode 100644 index 0000000..be3d86e --- /dev/null +++ b/kubernetes/helm/openslice/templates/cridge.yaml @@ -0,0 +1,61 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + namespace: {{ .Release.Namespace }} + labels: + app: {{ include "openslice.fullname" . }} + org.etsi.osl.service: cridge + chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + {{- include "openslice.labels" . | nindent 4 }} + name: {{ include "openslice.fullname" . }}-cridge +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + serviceName: {{ include "openslice.fullname" . }}-cridge + selector: + matchLabels: + app: {{ include "openslice.fullname" . }} + org.etsi.osl.service: cridge + {{- include "openslice.selectorLabels" . | nindent 6 }} + template: + metadata: + labels: + app: {{ include "openslice.fullname" . }} + org.etsi.osl.service: cridge + {{- include "openslice.selectorLabels" . | nindent 8 }} + spec: + initContainers: + - name: init-osscapi + image: busybox:1.28 + command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-osscapi; do echo waiting for osscapi; sleep 2; done"] + containers: + - image: "{{ .Values.image.cridge.repository }}:{{ .Values.image.cridge.tag | default .Chart.AppVersion }}" + name: {{ include "openslice.fullname" . }}-cridge + env: + - name: SPRING_APPLICATION_JSON + value: >- + { + "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", + "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", + "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", + "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default 'INFO' }}", + "org.etsi.osl.cridge" : "{{ .Values.cridge.mode | default 'DEBUG' }}" + } + resources: + {{- toYaml .Values.resources | nindent 12 }} + volumeMounts: + - name: cridge-kubeconfig + readOnly: true + mountPath: /root/.kube + readinessProbe: + exec: + command: ["sh", "-c", "kubectl version --client"] + initialDelaySeconds: 5 + periodSeconds: 2 + timeoutSeconds: 1 + restartPolicy: Always + volumes: + - name: cridge-kubeconfig + configMap: + name: {{ include "openslice.fullname" . }}-cridge-kubeconfig diff --git a/kubernetes/helm/openslice/templates/portalweb.yaml b/kubernetes/helm/openslice/templates/portalweb.yaml index 62b5d90..9beec9d 100644 --- a/kubernetes/helm/openslice/templates/portalweb.yaml +++ b/kubernetes/helm/openslice/templates/portalweb.yaml @@ -36,6 +36,10 @@ spec: - name: portalweb-configuration mountPath: /usr/share/nginx/html/nfvportal/js/config.js subPath: config.js + readinessProbe: + httpGet: + path: /tmf-api/serviceCatalogManagement/v4 + port: 80 volumes: - name: portalweb-configuration configMap: diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index 764d658..256322e 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -75,6 +75,11 @@ image: pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "develop" + cridge: + repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "develop" bugzillaurl: example.com:443/bugzilla bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z @@ -107,6 +112,9 @@ spring: mysql: storage: 10Gi +cridge: + mode: "DEBUG" + # Storage class to be used for provisioning. Default is manual # storageClass: ~ -- GitLab From 7b645cb4c141727a751fa6fd3c04d11a6021c734 Mon Sep 17 00:00:00 2001 From: dgiannopoulos Date: Mon, 15 Apr 2024 17:09:31 +0300 Subject: [PATCH 07/11] fix: sytax error --- kubernetes/helm/openslice/templates/cridge.yaml | 4 ++-- kubernetes/helm/openslice/templates/manoclient.yaml | 2 +- kubernetes/helm/openslice/templates/oasapi.yaml | 2 +- kubernetes/helm/openslice/templates/osom.yaml | 2 +- kubernetes/helm/openslice/templates/osportalapi.yaml | 2 +- kubernetes/helm/openslice/templates/osscapi.yaml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kubernetes/helm/openslice/templates/cridge.yaml b/kubernetes/helm/openslice/templates/cridge.yaml index be3d86e..7c80c48 100644 --- a/kubernetes/helm/openslice/templates/cridge.yaml +++ b/kubernetes/helm/openslice/templates/cridge.yaml @@ -39,8 +39,8 @@ spec: "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", - "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default 'INFO' }}", - "org.etsi.osl.cridge" : "{{ .Values.cridge.mode | default 'DEBUG' }}" + "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}", + "org.etsi.osl.cridge" : "{{ .Values.cridge.mode | default "DEBUG" }}" } resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/kubernetes/helm/openslice/templates/manoclient.yaml b/kubernetes/helm/openslice/templates/manoclient.yaml index e3f1664..caea660 100644 --- a/kubernetes/helm/openslice/templates/manoclient.yaml +++ b/kubernetes/helm/openslice/templates/manoclient.yaml @@ -34,7 +34,7 @@ spec: "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", - "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default 'INFO' }}" + "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}" } resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml index c995d89..1b4ec2c 100644 --- a/kubernetes/helm/openslice/templates/oasapi.yaml +++ b/kubernetes/helm/openslice/templates/oasapi.yaml @@ -54,7 +54,7 @@ spec: "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", - "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default 'INFO' }}" + "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}" } resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/kubernetes/helm/openslice/templates/osom.yaml b/kubernetes/helm/openslice/templates/osom.yaml index 30006af..906bed0 100644 --- a/kubernetes/helm/openslice/templates/osom.yaml +++ b/kubernetes/helm/openslice/templates/osom.yaml @@ -34,7 +34,7 @@ spec: "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", - "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default 'INFO' }}" + "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}" } resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml index 5d78d73..072c2f5 100644 --- a/kubernetes/helm/openslice/templates/osportalapi.yaml +++ b/kubernetes/helm/openslice/templates/osportalapi.yaml @@ -55,7 +55,7 @@ spec: "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", - "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default 'INFO' }}" + "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}" } resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml index b0f8f0f..6721ca2 100644 --- a/kubernetes/helm/openslice/templates/osscapi.yaml +++ b/kubernetes/helm/openslice/templates/osscapi.yaml @@ -55,7 +55,7 @@ spec: "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", - "logging.level.org.springframework": "{{ .Values.spring.logLevel | default 'INFO' }}", + "logging.level.org.springframework": "{{ .Values.spring.logLevel | default "INFO" }}", "kroki.serverurl":"{{ .Values.rooturl }}/kroki" } resources: -- GitLab From 3553d8517ffeb739efc3df3214500e2451ea078e Mon Sep 17 00:00:00 2001 From: dgiannopoulos Date: Thu, 18 Apr 2024 19:46:34 +0300 Subject: [PATCH 08/11] fix: helm syntax fix --- kubernetes/helm/openslice/templates/cridge-config.yaml | 2 +- kubernetes/helm/openslice/templates/mysql-config.yaml | 4 ++-- kubernetes/helm/openslice/templates/openslice-ingress.yaml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kubernetes/helm/openslice/templates/cridge-config.yaml b/kubernetes/helm/openslice/templates/cridge-config.yaml index d6611dc..a70e104 100644 --- a/kubernetes/helm/openslice/templates/cridge-config.yaml +++ b/kubernetes/helm/openslice/templates/cridge-config.yaml @@ -10,4 +10,4 @@ metadata: name: {{ include "openslice.fullname" . }}-cridge-kubeconfig data: kubeconfig: |- - {{ .Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml" | indent 4 }} + {{- .Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml" | nindent 4 }} diff --git a/kubernetes/helm/openslice/templates/mysql-config.yaml b/kubernetes/helm/openslice/templates/mysql-config.yaml index ae35d5f..0de0e52 100644 --- a/kubernetes/helm/openslice/templates/mysql-config.yaml +++ b/kubernetes/helm/openslice/templates/mysql-config.yaml @@ -9,5 +9,5 @@ metadata: {{- include "openslice.labels" . | nindent 4 }} name: {{ include "openslice.fullname" . }}-mysql-initdb-config data: - 01-databases.sql: |- - {{ .Files.Get "files/mysql-init/01-databases.sql" | indent 4 }} + 01-databases.sql: | + {{- tpl (.Files.Get "files/mysql-init/01-databases.sql") . | nindent 4 }} diff --git a/kubernetes/helm/openslice/templates/openslice-ingress.yaml b/kubernetes/helm/openslice/templates/openslice-ingress.yaml index 7c5523e..a2c4b57 100644 --- a/kubernetes/helm/openslice/templates/openslice-ingress.yaml +++ b/kubernetes/helm/openslice/templates/openslice-ingress.yaml @@ -14,12 +14,13 @@ spec: rules: - http: paths: + {{- $root := . }} # Preserve the root context {{- range .Values.ingress.paths }} - pathType: Prefix path: "{{ .path }}" backend: service: - name: {{ include "openslice.fullname" . }}-{{ .service }} + name: {{ include "openslice.fullname" $root }}-{{ .service }} port: number: {{ .port }} {{- end }} -- GitLab From c9f0ab2aa8815e3006eb8ed38c742ec338b18f18 Mon Sep 17 00:00:00 2001 From: dgiannopoulos Date: Thu, 18 Apr 2024 19:54:03 +0300 Subject: [PATCH 09/11] fix: corrected keycloak image based --- kubernetes/helm/openslice/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index 256322e..cbc1df7 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -26,7 +26,7 @@ image: # Overrides the image tag whose default is the chart appVersion. tag: "develop" keycloak: - repository: jboss/keycloak + repository: quay.io/keycloak/keycloak pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "16.1.1" -- GitLab From 858122e7f47e73584cd0e4a46b5095026faf416c Mon Sep 17 00:00:00 2001 From: dgiannopoulos Date: Thu, 25 Apr 2024 16:36:10 +0300 Subject: [PATCH 10/11] feat: cleanup of files and properties --- .../helm/openslice/templates/artemis.yaml | 1 + .../helm/openslice/templates/blockdiag.yaml | 1 + .../helm/openslice/templates/bugzilla.yaml | 1 + .../helm/openslice/templates/centrallog.yaml | 1 + .../openslice/templates/cridge-config.yaml | 2 +- .../helm/openslice/templates/cridge.yaml | 12 ++------ .../helm/openslice/templates/keycloak.yaml | 1 + .../helm/openslice/templates/kroki.yaml | 1 + .../helm/openslice/templates/manoclient.yaml | 1 + .../helm/openslice/templates/mysql.yaml | 1 + .../helm/openslice/templates/oasapi.yaml | 1 + kubernetes/helm/openslice/templates/osom.yaml | 1 + .../helm/openslice/templates/osportalapi.yaml | 1 + .../helm/openslice/templates/osscapi.yaml | 1 + .../helm/openslice/templates/portalweb.yaml | 1 + .../helm/openslice/templates/tmfweb.yaml | 1 + kubernetes/helm/openslice/values.yaml | 30 +++++++++---------- 17 files changed, 33 insertions(+), 25 deletions(-) diff --git a/kubernetes/helm/openslice/templates/artemis.yaml b/kubernetes/helm/openslice/templates/artemis.yaml index 74c4800..87c75ea 100644 --- a/kubernetes/helm/openslice/templates/artemis.yaml +++ b/kubernetes/helm/openslice/templates/artemis.yaml @@ -26,6 +26,7 @@ spec: spec: containers: - image: "{{ .Values.image.artemis.repository }}:{{ .Values.image.artemis.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.artemis.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-artemis resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/kubernetes/helm/openslice/templates/blockdiag.yaml b/kubernetes/helm/openslice/templates/blockdiag.yaml index fbd5e7a..30b2025 100644 --- a/kubernetes/helm/openslice/templates/blockdiag.yaml +++ b/kubernetes/helm/openslice/templates/blockdiag.yaml @@ -26,6 +26,7 @@ spec: spec: containers: - image: "{{ .Values.image.blockdiag.repository }}:{{ .Values.image.blockdiag.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.blockdiag.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-blockdiag resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/kubernetes/helm/openslice/templates/bugzilla.yaml b/kubernetes/helm/openslice/templates/bugzilla.yaml index 6402257..d759a25 100644 --- a/kubernetes/helm/openslice/templates/bugzilla.yaml +++ b/kubernetes/helm/openslice/templates/bugzilla.yaml @@ -26,6 +26,7 @@ spec: spec: containers: - image: "{{ .Values.image.bugzilla.repository }}:{{ .Values.image.bugzilla.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.bugzilla.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-bugzilla env: - name: SPRING_APPLICATION_JSON diff --git a/kubernetes/helm/openslice/templates/centrallog.yaml b/kubernetes/helm/openslice/templates/centrallog.yaml index a43e810..b8143fc 100644 --- a/kubernetes/helm/openslice/templates/centrallog.yaml +++ b/kubernetes/helm/openslice/templates/centrallog.yaml @@ -26,6 +26,7 @@ spec: spec: containers: - image: "{{ .Values.image.centrallog.repository }}:{{ .Values.image.centrallog.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.centrallog.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-centrallog env: - name: SPRING_APPLICATION_JSON diff --git a/kubernetes/helm/openslice/templates/cridge-config.yaml b/kubernetes/helm/openslice/templates/cridge-config.yaml index a70e104..a08ebd4 100644 --- a/kubernetes/helm/openslice/templates/cridge-config.yaml +++ b/kubernetes/helm/openslice/templates/cridge-config.yaml @@ -9,5 +9,5 @@ metadata: {{- include "openslice.labels" . | nindent 4 }} name: {{ include "openslice.fullname" . }}-cridge-kubeconfig data: - kubeconfig: |- + config: |- {{- .Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml" | nindent 4 }} diff --git a/kubernetes/helm/openslice/templates/cridge.yaml b/kubernetes/helm/openslice/templates/cridge.yaml index 7c80c48..3b90404 100644 --- a/kubernetes/helm/openslice/templates/cridge.yaml +++ b/kubernetes/helm/openslice/templates/cridge.yaml @@ -1,5 +1,5 @@ apiVersion: apps/v1 -kind: StatefulSet +kind: Deployment metadata: namespace: {{ .Release.Namespace }} labels: @@ -12,7 +12,6 @@ spec: {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} {{- end }} - serviceName: {{ include "openslice.fullname" . }}-cridge selector: matchLabels: app: {{ include "openslice.fullname" . }} @@ -31,6 +30,7 @@ spec: command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-osscapi; do echo waiting for osscapi; sleep 2; done"] containers: - image: "{{ .Values.image.cridge.repository }}:{{ .Values.image.cridge.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.cridge.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-cridge env: - name: SPRING_APPLICATION_JSON @@ -40,7 +40,7 @@ spec: "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}", - "org.etsi.osl.cridge" : "{{ .Values.cridge.mode | default "DEBUG" }}" + "org.etsi.osl.cridge" : "{{ .Values.cridge.mode | default "DEBUG" }}" } resources: {{- toYaml .Values.resources | nindent 12 }} @@ -48,12 +48,6 @@ spec: - name: cridge-kubeconfig readOnly: true mountPath: /root/.kube - readinessProbe: - exec: - command: ["sh", "-c", "kubectl version --client"] - initialDelaySeconds: 5 - periodSeconds: 2 - timeoutSeconds: 1 restartPolicy: Always volumes: - name: cridge-kubeconfig diff --git a/kubernetes/helm/openslice/templates/keycloak.yaml b/kubernetes/helm/openslice/templates/keycloak.yaml index 1b69756..fca2bdb 100644 --- a/kubernetes/helm/openslice/templates/keycloak.yaml +++ b/kubernetes/helm/openslice/templates/keycloak.yaml @@ -31,6 +31,7 @@ spec: hostNetwork: {{ .Values.hostNetwork }} containers: - image: "{{ .Values.image.keycloak.repository }}:{{ .Values.image.keycloak.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.keycloak.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-keycloak env: - name: DB_VENDOR diff --git a/kubernetes/helm/openslice/templates/kroki.yaml b/kubernetes/helm/openslice/templates/kroki.yaml index c6b6f71..3139d11 100644 --- a/kubernetes/helm/openslice/templates/kroki.yaml +++ b/kubernetes/helm/openslice/templates/kroki.yaml @@ -26,6 +26,7 @@ spec: spec: containers: - image: "{{ .Values.image.kroki.repository }}:{{ .Values.image.kroki.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.kroki.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-kroki resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/kubernetes/helm/openslice/templates/manoclient.yaml b/kubernetes/helm/openslice/templates/manoclient.yaml index caea660..88fd713 100644 --- a/kubernetes/helm/openslice/templates/manoclient.yaml +++ b/kubernetes/helm/openslice/templates/manoclient.yaml @@ -26,6 +26,7 @@ spec: spec: containers: - image: "{{ .Values.image.manoclient.repository }}:{{ .Values.image.manoclient.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.manoclient.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-manoclient env: - name: SPRING_APPLICATION_JSON diff --git a/kubernetes/helm/openslice/templates/mysql.yaml b/kubernetes/helm/openslice/templates/mysql.yaml index 6aa246a..b69a3f1 100644 --- a/kubernetes/helm/openslice/templates/mysql.yaml +++ b/kubernetes/helm/openslice/templates/mysql.yaml @@ -27,6 +27,7 @@ spec: spec: containers: - image: "{{ .Values.image.mysql.repository }}:{{ .Values.image.mysql.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.mysql.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-mysql args: - "--ignore-db-dir=lost+found" diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml index 1b4ec2c..c73b3df 100644 --- a/kubernetes/helm/openslice/templates/oasapi.yaml +++ b/kubernetes/helm/openslice/templates/oasapi.yaml @@ -34,6 +34,7 @@ spec: hostNetwork: {{ .Values.hostNetwork }} containers: - image: "{{ .Values.image.oasapi.repository }}:{{ .Values.image.oasapi.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.oasapi.pullPolicy | default "Always" }} name: {{ .Release.Name }}-oasapi env: - name: SPRING_APPLICATION_JSON diff --git a/kubernetes/helm/openslice/templates/osom.yaml b/kubernetes/helm/openslice/templates/osom.yaml index 906bed0..12edc14 100644 --- a/kubernetes/helm/openslice/templates/osom.yaml +++ b/kubernetes/helm/openslice/templates/osom.yaml @@ -26,6 +26,7 @@ spec: spec: containers: - image: "{{ .Values.image.osom.repository }}:{{ .Values.image.osom.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.osom.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-osom env: - name: SPRING_APPLICATION_JSON diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml index 072c2f5..c84ee91 100644 --- a/kubernetes/helm/openslice/templates/osportalapi.yaml +++ b/kubernetes/helm/openslice/templates/osportalapi.yaml @@ -35,6 +35,7 @@ spec: command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"] containers: - image: "{{ .Values.image.portalapi.repository }}:{{ .Values.image.portalapi.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.portalapi.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-osportalapi env: - name: SPRING_APPLICATION_JSON diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml index 6721ca2..e52a6b3 100644 --- a/kubernetes/helm/openslice/templates/osscapi.yaml +++ b/kubernetes/helm/openslice/templates/osscapi.yaml @@ -34,6 +34,7 @@ spec: command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"] containers: - image: "{{ .Values.image.osscapi.repository }}:{{ .Values.image.osscapi.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.osscapi.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-osscapi env: - name: SPRING_APPLICATION_JSON diff --git a/kubernetes/helm/openslice/templates/portalweb.yaml b/kubernetes/helm/openslice/templates/portalweb.yaml index 9beec9d..c2b22a1 100644 --- a/kubernetes/helm/openslice/templates/portalweb.yaml +++ b/kubernetes/helm/openslice/templates/portalweb.yaml @@ -27,6 +27,7 @@ spec: hostNetwork: {{ .Values.hostNetwork }} containers: - image: "{{ .Values.image.portalweb.repository }}:{{ .Values.image.portalweb.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.portalweb.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-portalweb resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/kubernetes/helm/openslice/templates/tmfweb.yaml b/kubernetes/helm/openslice/templates/tmfweb.yaml index 5ee8974..2d324ec 100644 --- a/kubernetes/helm/openslice/templates/tmfweb.yaml +++ b/kubernetes/helm/openslice/templates/tmfweb.yaml @@ -27,6 +27,7 @@ spec: hostNetwork: {{ .Values.hostNetwork }} containers: - image: "{{ .Values.image.tmfweb.repository }}:{{ .Values.image.tmfweb.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.tmfweb.pullPolicy | default "Always" }} name: {{ include "openslice.fullname" . }}-tmfweb resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml index cbc1df7..2f6ccca 100644 --- a/kubernetes/helm/openslice/values.yaml +++ b/kubernetes/helm/openslice/values.yaml @@ -7,77 +7,77 @@ replicaCount: 1 image: artemis: repository: apache/activemq-artemis - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "2.30.0" blockdiag: repository: yuzutech/kroki-blockdiag - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "latest" bugzilla: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "develop" centrallog: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "develop" keycloak: repository: quay.io/keycloak/keycloak - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "16.1.1" kroki: repository: yuzutech/kroki - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "latest" manoclient: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "develop" osom: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "develop" portalapi: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "develop" osscapi: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "develop" mysql: repository: mysql - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "5.7.43" oasapi: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "develop" portalweb: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "develop" tmfweb: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "develop" cridge: repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "develop" -- GitLab From a6afd64daf94db5f0bb26996572fe3b299bf18bc Mon Sep 17 00:00:00 2001 From: dgiannopoulos Date: Mon, 29 Apr 2024 11:52:11 +0300 Subject: [PATCH 11/11] fix: template cm before applying --- kubernetes/helm/openslice/templates/portalweb-config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubernetes/helm/openslice/templates/portalweb-config.yaml b/kubernetes/helm/openslice/templates/portalweb-config.yaml index 10e8ade..35e9c50 100644 --- a/kubernetes/helm/openslice/templates/portalweb-config.yaml +++ b/kubernetes/helm/openslice/templates/portalweb-config.yaml @@ -10,4 +10,5 @@ metadata: {{- include "openslice.labels" . | nindent 4 }} data: config.js: | - {{- .Files.Get "files/org.etsi.osl.portal.web/src/js/config.js" | nindent 4 }} + {{- tpl (.Files.Get "files/org.etsi.osl.portal.web/src/js/config.js") . | nindent 4 }} + \ No newline at end of file -- GitLab