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 0000000000000000000000000000000000000000..780374a2f6b47200b4256e026f9d0d13ecf25794
--- /dev/null
+++ b/kubernetes/helm/openslice/files/org.etsi.osl.cridge/kubeconfig.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+ certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM2akNDQWRLZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJMU1ESXdOREV4TVRVeU5Gb1hEVE0xTURJd01qRXhNakF5TkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTlZYCkNuclVYY0pYQ3kweEpwamp6MklDSm00dW5xWlZXL0M3MjYvWXF6cEJXTWk5dnJyRGVnS0Q3c3BjZlVyaEx6TEIKa0lMWnRtc2VwY3VHek81S3FlQXd3WkE5TGFJUUlzeElVV0FWYlcvUzBVQXZ2SkxzeVBiRVRTdm9yNm1DbnZIegpkcUVEdllrSUYrTkVSaFZPWElteElnV1cwMkZsK1pFd3dGeUxQbTBOWDlIZ2pFNHlUcVVwanFtZGVScjZsRXM2Cit5d3B0QnBpSHBsL2xnd0tNR1lqNjV2MDIzOFdYMnZhb1NzeVhobkxIK2pBSkFUaHVvMytHeHBWK09YNmNkMVAKejFQYWRHTmtyY01QRWs1djBJaU5oUXVDNXVEOElQQmtYYUloN05MRlk5RWgyNGR1RUlYY3d6TVYvc29QU0cxNQpKL0pVZ3ZrMFFwc3RxdTMvcjdzQ0F3RUFBYU5GTUVNd0RnWURWUjBQQVFIL0JBUURBZ0trTUJJR0ExVWRFd0VCCi93UUlNQVlCQWY4Q0FRQXdIUVlEVlIwT0JCWUVGTHE1QTVpSzhJK3RvYVlOQVYxd1NQQzFKQldSTUEwR0NTcUcKU0liM0RRRUJDd1VBQTRJQkFRQXdLVko4UzNSdCtKY3VFMXdHMmFrNnNoendMWkp0UGl6WnNucHhUOXFCN255ZQpsQXpmNURwZG1WUDVkYklvWUpsanRxK3BXb2V5VC9UQUM2d0YwOWo2RENsTXNydkdmVUFFcVkrNmtIa0dPaW1tCkFLTi9zOGtxNWtyVDE0T0I3Y3Y4RFJQWjdZRzRBQW1kSFpNazRTTUVJMnJUS0F4UVdvWUJwMFgxWWxlN1BoV3oKODg1WUExZ216VExQZGNDU3RPL1FBOS9kNktEQ0R2VFNRVXcva1hQWnVIWVYrejcrSzJrcXo3bk1IZjBhNzN5eAoxRGEyZjRrTVpaUHc3T2tWQ0kwbmxtamdGb1hOZ0w4SEdrTmhYbGRoUHY1K1ZBQVNjYlF3cDFtTFdVdUhDMWtaCmxwbi9uNit0UHZrNVkxY05nMGlSaFhDZGhzYlgxNzhCaUErZFR0RnQKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+ server: https://10.1.6.66:6443
+ name: apolychrono
+contexts:
+- context:
+ cluster: apolychrono
+ user: kubernetes-admin
+ name: kubernetes-admin@apolychrono
+current-context: kubernetes-admin@apolychrono
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+ user:
+ client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURJVENDQWdtZ0F3SUJBZ0lJUGdTbnVjMURGN3d3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TlRBeU1EUXhNVEUxTWpSYUZ3MHlOakF5TURReE1USXhNRE5hTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTkrUDVqSDF2WE8wZHNHSGkKWEd0aFgrL2RPOTViMzFYY0FhV0pwWmV1UFFaWFpvMVdOdTJ0cUF6bGRNRnVSS3NKZHdmMHBRS29xOUdDTVVvZAo3VFE5Zk5rSDZWaU9FRzZIM0tCR2xoa2Z2ZXlYTTVYcFRZMHZQK21lK21JdjMyWW9lM2E2WDNBNWs3VmJCeWJaCjlneFRSak5LN2xTSkN0b1htc0h4Tk9tdWNpUDlnNWJpSHF3S0VZZE9aOXd6OHVsMkVVUHE0UlUxdmMyalBCV0cKLzZoMnlrRmNKdWVJLzZEOHlhV2pOWjBKZ3k1TnZRTUljWGhRd3dSU0lpOWFxb2UyRzNrRnNzYmR5dFFSUk1nVQpuRFZxQ2x0ZDUrRFExV0o1RWhHaG9LS0ZNUmZMUExsbWR5dlNXU3B0cFl1eVF6QVVOYWVnN2QrS2VDVFlvNUZLClE4dmFmd0lEQVFBQm8xWXdWREFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RBWURWUjBUQVFIL0JBSXdBREFmQmdOVkhTTUVHREFXZ0JTNnVRT1lpdkNQcmFHbURRRmRjRWp3dFNRVgprVEFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBVWljNnlyekxCUmxWM0xoOEREK3NZbEtEZENKTllibWIyM3h0CjQydG9ORlpWWm1SSGxrVnU1MWp2cTFrWEdlRjNzd0t0UmtVVzhWVVpYMnNsL0F2cTBnb2t4bkVESndaN1RRL0oKaWVoMGMrdmd6RGQzbHUrOFJlOFZscUxWVVpTYjdpdGtPQUhHVW5VOE5KaEJHUHRMTTFpTTlQa2g0ditMaU94dQpoNXMzVGxxU2ZObzJkMHM0UzljNkVoYVM4cUZLTmdvRG8xblNBRHFSN3BscEZzWUh4VXVERWhNRlVpcVBneUd6Cis3T0tRakJqNUQxSzd1WUdUd0JjKzZZdWc1RGRpd0VvWCtyNTZFd1FwVE8ydXhSUU1UZGlmbks1akExdWNXaEwKUnd4M203b0llclhnMU5md0M1dUE0bThZQlJhRUZBdDZTelJvbmR5MFpPY0RDa1dDN3c9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+ client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBOStQNWpIMXZYTzBkc0dIaVhHdGhYKy9kTzk1YjMxWGNBYVdKcFpldVBRWlhabzFXCk51MnRxQXpsZE1GdVJLc0pkd2YwcFFLb3E5R0NNVW9kN1RROWZOa0g2VmlPRUc2SDNLQkdsaGtmdmV5WE01WHAKVFkwdlArbWUrbUl2MzJZb2UzYTZYM0E1azdWYkJ5Ylo5Z3hUUmpOSzdsU0pDdG9YbXNIeE5PbXVjaVA5ZzViaQpIcXdLRVlkT1o5d3o4dWwyRVVQcTRSVTF2YzJqUEJXRy82aDJ5a0ZjSnVlSS82RDh5YVdqTlowSmd5NU52UU1JCmNYaFF3d1JTSWk5YXFvZTJHM2tGc3NiZHl0UVJSTWdVbkRWcUNsdGQ1K0RRMVdKNUVoR2hvS0tGTVJmTFBMbG0KZHl2U1dTcHRwWXV5UXpBVU5hZWc3ZCtLZUNUWW81RktROHZhZndJREFRQUJBb0lCQUVLRXFFZ3N1SjlrK1Z5RgpSNnFwSGQ0U2pYa3ROOVg4UWljbTlvSzY2d1J4R1M3cHFrTGZFSVJSd1pqTTl2dnlNWDRCWW9LTTdobjlCRVNaCnNPSWY3SWY5N1FPT3djQmpDSTRKYkNlRzRsK2lod2hPcCtZcGhvNU44RjBieitEUWx2aGFhYlNHZHN6T0Uza2QKMGNzV2o1bjgxWlNTbHB1VTNsU215a1Q2bDljRWppVEhGeHdqOW45c3g5bUVhODBBVmNkVDJidDJMSmdja29mMwpXbzRxZ2hzUTRSMGxxcUh4U0RmcEcwUnV6aGhKUGtXWDdsY0Vva3VXSDdpTTBwdWppcXFqOHFaYXQrRnFzMzIwClpEbEowU2drWkdJOS9XZ1BZc3NuK2xWSE10aHV4VFJaRjh5eVU2S0pMSHN1dEZmcHkvZ3RhU2tYczhxWTJlQmEKWXZvM2N5RUNnWUVBK1p4dnlZMGZ6NG13VWtxdEZQdXR3OFRINFRnZUZyRHBISUNxbEFqckRWTTZqN1ZHbWMxawp6NWdpOVFQL1ROeERnN0V6bWc4V3l3RVRTaU5xWEtCeUI5UmMwTlNVOVAxSnJDMzJOTGVCdVhFTE43L0oyT1N0ClJ3VERwdE91eEpvQndzUlpyQjlDb2JYdVlRSTBqaEFubkxTMUtYbFAzSC9jQW1EUzIwQ0Y4aGtDZ1lFQS9qeEQKcUpQeTJLL3BSMjJCZnAwbS9DcURpS0x3cUR0UUNRSjhwSkVPM29KN3NHQ2t6MHI3dHpTeG1GMXVpUXZISlQrUwpkNkQyUnJqd2JnOHVrbnc5SURwRERoVm5pTGw0K0xFSjY1S2c5b2dPRk9INlJHU2c0LzFBWkE4TVE3bXQza1NFCmQ3dkZNejdPOGJQTlBDYTNQWUpFSzVzWWdMamswci9mVUN3VnRGY0NnWUVBbzNGazNXUDBIWEE2TFZoS2h6L1oKWXlRYUFZWStaWHRIMk9zRFJ0V2tHK0NRcXdMM0RNU3FLeWlpVXk5ZjMxTW5QamNzNDhiWGxPdktWclJqOCt6MwpYZHNYUDRMRFdydnpuck9sMEpVTWM0SHE1NEZFeVNuTHNJSVZIc3JqV0ViRHVtWFpsZFFPVEZjVmxSM2RqZHhVCkk4OU1CTEV6c3QxaUVZaVc2UXdSNlJrQ2dZRUF2OU5tMVlhMFFJMFNmaU9CQnJDNjNwK1JXWUpnQlArajF2aDYKWlkxUjQ5QWVWYW5HRU9hcDRNVXdqeDlJTEwyblNGS2NTQWs2YVloWFdTTzVaeXU0ejExR2hSVGZac2xUSG9vdQpTd0g2MDZrNnZzVDNHYTIzdSs2MUxBb3luZE0yL2pOQ3BEa1loUjhKOUZOUE11aWZjQmlmS1N2QUpEZmQ1NnFBCmE3U250OGNDZ1lCZEFkMDRaOWJDL1N3S0lQUm1WL2J6RE9NWll1ODVCMjliZkhiNjdQSXVqRTZMczJyaGpwdS8KU00yQnFES095dVZOTEtkZTArOFBRYWJyUlFPNm1Fd0doaHNtYU5xemtqbzZEbmNhZDFoNHRFeEQxUmZwbE5kWApjQ0oyalEwZWE5eVZEdkZkRHVTSWtJbkgzT21EUE1jMHhFb21TRXpwamJHWEJnRGVBbEg2dHc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
diff --git a/kubernetes/helm/openslice/files/org.etsi.osl.portal.web/src/js/config.js b/kubernetes/helm/openslice/files/org.etsi.osl.portal.web/src/js/config.js
new file mode 100644
index 0000000000000000000000000000000000000000..d75edbc30ad61f3cca56deb40efe742ac3d6327b
--- /dev/null
+++ b/kubernetes/helm/openslice/files/org.etsi.osl.portal.web/src/js/config.js
@@ -0,0 +1,14 @@
+var appConfig = angular.module('portalwebapp.config',[]);
+
+appConfig.factory('APIEndPointService', function() {
+ return {
+ TITLE: "OpenSlice by ETSI",
+ WIKI: "https://osl.etsi.org/documentation/",
+ BUGZILLA: "{{ .Values.rooturl }}/bugzilla",
+ STATUS: "{{ .Values.rooturl }}/status",
+ APIURL: "{{ .Values.rooturl }}",
+ WEBURL: "{{ .Values.rooturl }}/nfvportal",
+ APIOAUTHURL: "{{ .Values.rooturl }}/auth/realms/openslice",
+ APITMFURL: "{{ .Values.rooturl }}/tmf-api/serviceCatalogManagement/v4"
+ };
+});
diff --git a/kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/config.prod.json b/kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/config.prod.json
new file mode 100644
index 0000000000000000000000000000000000000000..b46d9d8ac9f29b77eba96337fa0ee4f9eb1687bc
--- /dev/null
+++ b/kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/config.prod.json
@@ -0,0 +1,31 @@
+{
+ "TITLE": "OpenSlice by ETSI",
+ "PORTALVERSION":"2024Q2",
+ "WIKI": "https://osl.etsi.org/documentation",
+ "BUGZILLA": "{BASEURL}/bugzilla/",
+ "STATUS": "{BASEURL}/healthstatus/",
+ "WEBURL": "{BASEURL}",
+ "PORTAL_REPO_APIURL": "{BASEURL}/osapi",
+ "ASSURANCE_SERVICE_MGMT_APIURL": "{BASEURL}/oas-api",
+ "APITMFURL": "{BASEURL}/tmf-api",
+ "OAUTH_CONFIG" : {
+ "issuer": "{BASEURL}/auth/realms/openslice",
+ "loginUrl": "{BASEURL}/auth/realms/openslice/protocol/openid-connect/auth",
+ "tokenEndpoint": "{BASEURL}/auth/realms/openslice/protocol/openid-connect/token",
+ "userinfoEndpoint": "{BASEURL}/auth/realms/openslice/protocol/openid-connect/userinfo",
+ "redirectUri": "{BASEURL}/redirect",
+ "logoutUrl": "{BASEURL}/auth/realms/openslice/protocol/openid-connect/logout",
+ "postLogoutRedirectUri": "{BASEURL}",
+
+ "responseType": "code",
+ "oidc": false,
+ "clientId": "osapiWebClientId",
+ "dummyClientSecret": "secret",
+
+ "requireHttps": false,
+ "useHttpBasicAuth": true,
+ "clearHashAfterLogin": false,
+
+ "showDebugInformation": true
+ }
+}
diff --git a/kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/theming.scss b/kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/theming.scss
new file mode 100644
index 0000000000000000000000000000000000000000..8e515db3e922c32fc2bbf203e8be8f8a1af0d2dc
--- /dev/null
+++ b/kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/theming.scss
@@ -0,0 +1,22 @@
+/* Default theme */
+
+$primary: #428bca;
+$secondary: #6c6c6c;
+
+/* ------------------------------ */
+/* Predefined palette 1 theme */
+
+/* $primary: rgba(0,45,126); */
+/* $secondary: #6c6c6c; */
+
+/* ------------------------------ */
+/* Predefined palette 2 theme */
+
+/* $primary: rgba(255, 124, 0); */
+/* $secondary: #6c6c6c; */
+
+/* ------------------------------ */
+/* Predefined palette 3 theme */
+
+/* $primary: rgba(247,1, 2); */
+/* $secondary: #6c6c6c; */
diff --git a/kubernetes/helm/openslice/my-values.yaml b/kubernetes/helm/openslice/my-values.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f9bca0ab2a2316d51a9cdbc5746071d79149f00a
--- /dev/null
+++ b/kubernetes/helm/openslice/my-values.yaml
@@ -0,0 +1,246 @@
+# Default values for openslice.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+ artemis:
+ repository: apache/activemq-artemis
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "2.31.1"
+ blockdiag:
+ repository: yuzutech/kroki-blockdiag
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "0.18.0"
+ bugzilla:
+ repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "latest"
+ centrallog:
+ repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "latest"
+ keycloak:
+ repository: quay.io/keycloak/keycloak
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "16.1.1"
+ kroki:
+ repository: yuzutech/kroki
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "0.18.0"
+ manoclient:
+ repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "latest"
+ osom:
+ repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "latest"
+ portalapi:
+ repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "latest"
+ osscapi:
+ repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "latest"
+ mysql:
+ repository: mysql
+ 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: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "latest"
+ portalweb:
+ repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "latest"
+ tmfweb:
+ repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "latest"
+ cridge:
+ repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "latest"
+ metrico:
+ repository: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "latest"
+
+bugzillaurl: example.com:443/bugzilla
+bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
+main_operations_product: My Operations
+centrallogurl: http://elk_ip:elk_port/index_name/_doc
+rooturl: http://10.1.6.67 # This is the ingress LB IP or domain - ex. http://openslice.com:port or http://3.15.198.35:8080
+
+oscreds:
+ activemq:
+ user: artemis
+ password: artemis
+ mysql:
+ username: root
+ password: letmein
+ openslicedb: osdb
+ keycloak:
+ database: keycloak
+ username: keycloak
+ password: password
+ adminpassword: Pa55w0rd
+ portal:
+ database: osdb
+ username: portaluser
+ password: 12345
+
+spring:
+ oauthClientSecret: secret
+
+mysql:
+ storage: 10Gi
+
+metrico:
+ enabled: false
+ logLevel: DEBUG
+ spring:
+ loglevel: DEBUG
+
+cridge:
+ enabled: true
+ logLevel: INFO
+ spring:
+ loglevel: INFO
+ kubeconfig:
+ base64: "" # Provide base64-encoded kubeconfig here if available
+ raw: "" # Provide raw kubeconfig here if available
+
+portalapi:
+ logLevel: INFO
+ spring:
+ loglevel: INFO
+
+manoclient:
+ spring:
+ loglevel: INFO
+
+oasapi:
+ spring:
+ loglevel: INFO
+
+osom:
+ spring:
+ loglevel: INFO
+ datasource:
+ url: "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1"
+
+osscapi:
+ spring:
+ loglevel: INFO
+
+# Storage class to be used for provisioning. Default is manual
+storageClass: vdb
+
+hostNetwork: false
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+ # Specifies whether a service account should be created
+ create: true
+ # Annotations to add to the service account
+ annotations: {}
+ # The name of the service account to use.
+ # If not set and create is true, a name is generated using the fullname template
+ name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+ # fsGroup: 2000
+
+securityContext: {}
+ # capabilities:
+ # drop:
+ # - ALL
+ # readOnlyRootFilesystem: true
+ # runAsNonRoot: true
+ # runAsUser: 1000
+
+service:
+ type: ClusterIP
+ port: 80
+
+ingress:
+ paths:
+ - path: "/tmf-api"
+ service: "osscapi"
+ port: 13082
+ - path: "/oas-api"
+ service: "oasapi"
+ port: 13101
+ - path: "/auth"
+ service: "keycloak"
+ port: 8080
+ - path: "/kroki/(.*)"
+ service: "kroki"
+ port: 8000
+ - path: "/osapi"
+ service: "osportalapi"
+ port: 13000
+ - path: "/nfvportal"
+ service: "portalweb"
+ port: 80
+ - path: "/"
+ service: "tmfweb"
+ port: 80
+ annotations: {}
+
+
+ tls: []
+ # - secretName: chart-example-tls
+ # hosts:
+ # - chart-example.local
+
+resources: {}
+ # We usually recommend not to specify default resources and to leave this as a conscious
+ # choice for the user. This also increases chances charts run on environments with little
+ # resources, such as Minikube. If you do want to specify resources, uncomment the following
+ # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+ # limits:
+ # cpu: 100m
+ # memory: 128Mi
+ # requests:
+ # cpu: 100m
+ # memory: 128Mi
+
+autoscaling:
+ enabled: false
+ minReplicas: 1
+ maxReplicas: 100
+ targetCPUUtilizationPercentage: 80
+ targetMemoryUtilizationPercentage: 80
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/kubernetes/helm/openslice/templates/keycloak.yaml b/kubernetes/helm/openslice/templates/keycloak.yaml
index fca2bdbe8782e30adda9e4a54e3b0aa455f5a573..1f90e6de5b2439b7400ca8843f9972546285dce8 100644
--- a/kubernetes/helm/openslice/templates/keycloak.yaml
+++ b/kubernetes/helm/openslice/templates/keycloak.yaml
@@ -25,9 +25,9 @@ spec:
{{- include "openslice.selectorLabels" . | nindent 8 }}
spec:
initContainers:
- - name: init-mysql-portal
+ - name: init-mysql
image: busybox:1.28
- command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"]
+ command: ['sh', '-c', 'until nc -z {{ include "openslice.fullname" . }}-mysql 3306; do echo "Waiting for mysql..."; sleep 2; done']
hostNetwork: {{ .Values.hostNetwork }}
containers:
- image: "{{ .Values.image.keycloak.repository }}:{{ .Values.image.keycloak.tag | default .Chart.AppVersion }}"
@@ -69,6 +69,12 @@ spec:
httpGet:
path: /auth/realms/master
port: 8080
+ startupProbe:
+ httpGet:
+ path: /auth/realms/master
+ port: 8080
+ failureThreshold: 60
+ periodSeconds: 10
volumes:
- name: "keycloak-configuration"
configMap:
diff --git a/kubernetes/helm/openslice/templates/kroki-ingress.yaml b/kubernetes/helm/openslice/templates/kroki-ingress.yaml
index 5127bdb12296565a01db48edf23d8da25c270674..54c7ed12dee6dd05a8ece9582036360c129d3d39 100644
--- a/kubernetes/helm/openslice/templates/kroki-ingress.yaml
+++ b/kubernetes/helm/openslice/templates/kroki-ingress.yaml
@@ -10,7 +10,7 @@ metadata:
nginx.ingress.kubernetes.io/rewrite-target: "/$1"
name: {{ include "openslice.fullname" . }}-kroki-ingress
spec:
- ingressClassName: nginx
+ ingressClassName: contour
rules:
- http:
paths:
diff --git a/kubernetes/helm/openslice/templates/metrico.yaml b/kubernetes/helm/openslice/templates/metrico.yaml
index 620ca0aa2146d38585535fbad658d42536ec7a53..84af7a118b524c396f4abc02ce9578affdd0f8f8 100644
--- a/kubernetes/helm/openslice/templates/metrico.yaml
+++ b/kubernetes/helm/openslice/templates/metrico.yaml
@@ -1,7 +1,7 @@
{{ if .Values.metrico.enabled }}
apiVersion: apps/v1
kind: Deployment
-metadata:
+metadata:
namespace: {{ .Release.Namespace }}
labels:
app: {{ include "openslice.fullname" . }}
@@ -25,6 +25,10 @@ spec:
org.etsi.osl.service: metrico
{{- include "openslice.selectorLabels" . | nindent 8 }}
spec:
+ initContainers:
+ - name: init-mysql-portal
+ image: busybox:1.28
+ command: ['sh', '-c', 'until nc -z {{ include "openslice.fullname" . }}-mysql 3306; do echo "Waiting for mysql..."; sleep 2; done']
containers:
- image: "{{ .Values.image.metrico.repository }}:{{ .Values.image.metrico.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.metrico.pullPolicy | default "Always" }}
diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml
index bf78b5dd478c19f009fddd599d6537fb7b667c66..7738545c16ff542ebddb4c7c5c19d446aa072866 100644
--- a/kubernetes/helm/openslice/templates/oasapi.yaml
+++ b/kubernetes/helm/openslice/templates/oasapi.yaml
@@ -1,6 +1,6 @@
apiVersion: apps/v1
kind: Deployment
-metadata:
+metadata:
namespace: {{ .Release.Namespace }}
labels:
app: {{ include "openslice.fullname" . }}
@@ -27,16 +27,13 @@ spec:
initContainers:
- name: init-keycloak
image: busybox:1.28
- command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-keycloak; do echo waiting for keycloak; sleep 2; done"]
- - name: init-mysql-portal
- image: busybox:1.28
- command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"]
+ command: ['sh', '-c', 'until nc -z {{ include "openslice.fullname" . }}-keycloak 8080; do echo "Waiting for keycloack..."; sleep 5; done;']
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:
+ env:
- name: SPRING_APPLICATION_JSON
value: >-
{
diff --git a/kubernetes/helm/openslice/templates/openslice-ingress.yaml b/kubernetes/helm/openslice/templates/openslice-ingress.yaml
index a5f731485acad1a42297e77910cf176a152cc576..435142cc64a8dbde81a839576dda243f28c4bbc5 100644
--- a/kubernetes/helm/openslice/templates/openslice-ingress.yaml
+++ b/kubernetes/helm/openslice/templates/openslice-ingress.yaml
@@ -10,7 +10,7 @@ metadata:
{{- toYaml .Values.ingress.annotations | nindent 4 }}
name: {{ include "openslice.fullname" . }}-openslice-ingress
spec:
- ingressClassName: nginx
+ ingressClassName: contour
rules:
- http:
paths:
diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml
index 6df11d4899aec82bc2f40444c8721ee57e94edce..9e6f122e1189e5891f2fce74cd0c647d7af3da85 100644
--- a/kubernetes/helm/openslice/templates/osportalapi.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi.yaml
@@ -1,7 +1,7 @@
---
apiVersion: apps/v1
kind: Deployment
-metadata:
+metadata:
namespace: {{ .Release.Namespace }}
labels:
app: {{ include "openslice.fullname" . }}
@@ -27,12 +27,9 @@ spec:
spec:
hostNetwork: {{ .Values.hostNetwork }}
initContainers:
- - name: init-keycloak
- image: busybox:1.28
- command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-keycloak; do echo waiting for keycloak; sleep 2; done"]
- - name: init-mysql-portal
+ - name: init-oasapi
image: busybox:1.28
- command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"]
+ command: ['sh', '-c', 'until nc -z {{ include "openslice.fullname" . }}-oasapi 13101; do echo "Waiting for osapi..."; sleep 5; done;']
containers:
- image: "{{ .Values.image.portalapi.repository }}:{{ .Values.image.portalapi.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.portalapi.pullPolicy | default "Always" }}
diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml
index 758d5194bba9efd07fe9e9b5dcdcb91a17611667..05cb714003cbebd093663ce5764f319af027007d 100644
--- a/kubernetes/helm/openslice/templates/osscapi.yaml
+++ b/kubernetes/helm/openslice/templates/osscapi.yaml
@@ -1,6 +1,6 @@
apiVersion: apps/v1
kind: Deployment
-metadata:
+metadata:
namespace: {{ .Release.Namespace }}
labels:
app: {{ include "openslice.fullname" . }}
@@ -26,12 +26,9 @@ spec:
spec:
hostNetwork: {{ .Values.hostNetwork }}
initContainers:
- - name: init-keycloak
- image: busybox:1.28
- command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-keycloak; do echo waiting for keycloak; sleep 2; done"]
- - name: init-mysql-portal
+ - name: init-osportalapi
image: busybox:1.28
- command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"]
+ command: ['sh', '-c', 'until nc -z {{ include "openslice.fullname" . }}-osportalapi 13000; do echo "Waiting for osportalapi..."; sleep 5; done;']
containers:
- image: "{{ .Values.image.osscapi.repository }}:{{ .Values.image.osscapi.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.osscapi.pullPolicy | default "Always" }}