From a55fdb173b6a494f054c9b2599fbbbc83cbabf7c Mon Sep 17 00:00:00 2001
From: dgiannopoulos <dimitris.giannopoulos@hotmail.com>
Date: Thu, 8 Feb 2024 19:15:13 +0200
Subject: [PATCH] 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