From 6a10326a9e45cab09e388c805849d665fa55a66d Mon Sep 17 00:00:00 2001 From: lhwang Date: Mon, 13 Nov 2023 18:33:46 +0800 Subject: [PATCH 1/3] allow using custom harbor repository in tmf&tapm --- charts/apm-component/charts/apm-api/values.yaml | 4 ++-- .../charts/apm-operator/templates/deployment.yaml | 4 +++- .../apm-component/charts/apm-operator/values.yaml | 4 ++-- charts/apm-component/charts/apm-portal/values.yaml | 4 ++-- charts/apm-component/values.yaml | 8 ++++---- .../framework-operator/templates/deployment.yaml | 4 +++- .../charts/framework-operator/values.yaml | 4 ++-- charts/tmf-component/charts/initializr/values.yaml | 4 ++-- charts/tmf-component/charts/msa-portal/values.yaml | 4 ++-- .../charts/spring-cloud-api/values.yaml | 4 ++-- charts/tmf-component/values.yaml | 14 +++++++------- 11 files changed, 31 insertions(+), 27 deletions(-) diff --git a/charts/apm-component/charts/apm-api/values.yaml b/charts/apm-component/charts/apm-api/values.yaml index 244532b..5b5091a 100644 --- a/charts/apm-component/charts/apm-api/values.yaml +++ b/charts/apm-component/charts/apm-api/values.yaml @@ -4,8 +4,8 @@ replicaCount: 1 image: - registry: 192.168.90.214 - repository: system_containers/apm-api + registry: 192.168.90.214/system_containers + repository: apm-api pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "v5.6.0" diff --git a/charts/apm-component/charts/apm-operator/templates/deployment.yaml b/charts/apm-component/charts/apm-operator/templates/deployment.yaml index 948dc2e..c549b50 100644 --- a/charts/apm-component/charts/apm-operator/templates/deployment.yaml +++ b/charts/apm-component/charts/apm-operator/templates/deployment.yaml @@ -59,7 +59,9 @@ spec: valueFrom: secretKeyRef: key: password - name: pkcs12-password-secret + name: pkcs12-password-secret + - name: HARBOR_URL + value: {{ .Values.image.registry }} volumeMounts: - mountPath: /etc/localtime name: localtime diff --git a/charts/apm-component/charts/apm-operator/values.yaml b/charts/apm-component/charts/apm-operator/values.yaml index fd44c8f..a703658 100644 --- a/charts/apm-component/charts/apm-operator/values.yaml +++ b/charts/apm-component/charts/apm-operator/values.yaml @@ -5,8 +5,8 @@ replicaCount: 1 image: - registry: 192.168.90.214 - repository: system_containers/apm-operator-server + registry: 192.168.90.214/system_containers + repository: apm-operator-server pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "v5.6.0" diff --git a/charts/apm-component/charts/apm-portal/values.yaml b/charts/apm-component/charts/apm-portal/values.yaml index 91b6141..feeea70 100644 --- a/charts/apm-component/charts/apm-portal/values.yaml +++ b/charts/apm-component/charts/apm-portal/values.yaml @@ -4,8 +4,8 @@ replicaCount: 1 image: - registry: 192.168.90.214 - repository: system_containers/apm-portal + registry: 192.168.90.214/system_containers + repository: apm-portal pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "v5.6.0" diff --git a/charts/apm-component/values.yaml b/charts/apm-component/values.yaml index deabdec..3611c54 100644 --- a/charts/apm-component/values.yaml +++ b/charts/apm-component/values.yaml @@ -3,7 +3,7 @@ global: host: true registry: ®istry - docker.io + docker.io/refar # Ingress host name ingressHostName: &ingressHostName 'portal.192.168.90.217.nip.io' @@ -20,7 +20,7 @@ global: apm-portal: image: registry: *registry - repository: refar/apm-portal + repository: apm-portal tag: "v5.7.1" ingress: hostName: *ingressHostName @@ -28,7 +28,7 @@ apm-portal: apm-api: image: registry: *registry - repository: refar/apm-api + repository: apm-api tag: "v5.7.1" ingress: hostName: *ingressHostName @@ -36,5 +36,5 @@ apm-api: apm-operator: image: registry: *registry - repository: refar/apm-operator-server + repository: apm-operator-server tag: "v5.7.1" diff --git a/charts/tmf-component/charts/framework-operator/templates/deployment.yaml b/charts/tmf-component/charts/framework-operator/templates/deployment.yaml index d4a3b35..b7b31f7 100644 --- a/charts/tmf-component/charts/framework-operator/templates/deployment.yaml +++ b/charts/tmf-component/charts/framework-operator/templates/deployment.yaml @@ -66,7 +66,9 @@ spec: valueFrom: secretKeyRef: key: password - name: pkcs12-password-secret + name: pkcs12-password-secret + - name: HARBOR_URL + value: {{ .Values.image.registry }} volumeMounts: - mountPath: /etc/localtime name: localtime diff --git a/charts/tmf-component/charts/framework-operator/values.yaml b/charts/tmf-component/charts/framework-operator/values.yaml index a95cc0b..a321f7c 100644 --- a/charts/tmf-component/charts/framework-operator/values.yaml +++ b/charts/tmf-component/charts/framework-operator/values.yaml @@ -5,8 +5,8 @@ replicaCount: 1 image: - registry: 192.168.90.214 - repository: system_containers/framework-operator-server + registry: 192.168.90.214/system_containers + repository: framework-operator-server pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "v5.6.0" diff --git a/charts/tmf-component/charts/initializr/values.yaml b/charts/tmf-component/charts/initializr/values.yaml index 64b66b0..44cbadd 100644 --- a/charts/tmf-component/charts/initializr/values.yaml +++ b/charts/tmf-component/charts/initializr/values.yaml @@ -5,8 +5,8 @@ replicaCount: 1 image: - registry: 192.168.90.214 - repository: system_containers/initializr-api + registry: 192.168.90.214/system_containers + repository: initializr-api pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "v5.3.0" diff --git a/charts/tmf-component/charts/msa-portal/values.yaml b/charts/tmf-component/charts/msa-portal/values.yaml index f3538ba..6d66140 100644 --- a/charts/tmf-component/charts/msa-portal/values.yaml +++ b/charts/tmf-component/charts/msa-portal/values.yaml @@ -4,8 +4,8 @@ replicaCount: 1 image: - registry: 192.168.90.214 - repository: system_containers/msa-portal + registry: 192.168.90.214/system_containers + repository: msa-portal pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "v5.6.0" diff --git a/charts/tmf-component/charts/spring-cloud-api/values.yaml b/charts/tmf-component/charts/spring-cloud-api/values.yaml index 8575cda..6574494 100644 --- a/charts/tmf-component/charts/spring-cloud-api/values.yaml +++ b/charts/tmf-component/charts/spring-cloud-api/values.yaml @@ -1,8 +1,8 @@ replicaCount: 1 image: - registry: 192.168.90.214 - repository: system_containers/spring-cloud-api + registry: 192.168.90.214/system_containers + repository: spring-cloud-api pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "v5.7.1" diff --git a/charts/tmf-component/values.yaml b/charts/tmf-component/values.yaml index 046e288..abe604d 100644 --- a/charts/tmf-component/values.yaml +++ b/charts/tmf-component/values.yaml @@ -3,7 +3,7 @@ global: host: true registry: ®istry - docker.io + docker.io/refar # Ingress host name ingressHostName: &ingressHostName @@ -20,7 +20,7 @@ msa-portal: enabled: true image: registry: *registry - repository: refar/msa-portal + repository: msa-portal tag: "v5.7.1" ingress: hostName: *ingressHostName @@ -29,7 +29,7 @@ spring-cloud-api: enabled: true image: registry: *registry - repository: refar/spring-cloud-api + repository: spring-cloud-api tag: "v5.7.1" ingress: hostName: *ingressHostName @@ -38,7 +38,7 @@ initializr: enabled: true image: registry: *registry - repository: refar/initializr-api + repository: initializr-api tag: "v5.3.0" ingress: hostName: *ingressHostName @@ -49,13 +49,13 @@ framework-operator: clusterId: default-cluster image: registry: *registry - repository: refar/framework-operator-server + repository: framework-operator-server tag: "v5.7.1" certImage: registry: *registry - repository: refar/operator-cert-tmf + repository: operator-cert-tmf tag: "v5.7.1" envInjectorImage: registry: *registry - repository: refar/tmf-env-injector + repository: tmf-env-injector tag: "latest" From 13403197c4e2ba05dc4b5eaf1e6b7b63e5289253 Mon Sep 17 00:00:00 2001 From: lhwang Date: Fri, 8 Dec 2023 17:41:41 +0800 Subject: [PATCH 2/3] Fix the error of create configmap when install tmf component --- charts/tmf-component/charts/msa-portal/values.yaml | 3 +++ charts/tmf-component/values.yaml | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/tmf-component/charts/msa-portal/values.yaml b/charts/tmf-component/charts/msa-portal/values.yaml index 6d66140..c4ee59c 100644 --- a/charts/tmf-component/charts/msa-portal/values.yaml +++ b/charts/tmf-component/charts/msa-portal/values.yaml @@ -10,6 +10,9 @@ image: # Overrides the image tag whose default is the chart appVersion. tag: "v5.6.0" +cluster: + server: https://192.168.1.1 + imagePullSecrets: [] nameOverride: "msa-portal" appName: "springcloud" diff --git a/charts/tmf-component/values.yaml b/charts/tmf-component/values.yaml index abe604d..beae8bc 100644 --- a/charts/tmf-component/values.yaml +++ b/charts/tmf-component/values.yaml @@ -4,7 +4,9 @@ global: registry: ®istry docker.io/refar - + # Cluster server's url, it's the url of oidc proxy generally + clusterServer: &clusterServer + https://192.168.1.1 # Ingress host name ingressHostName: &ingressHostName 'portal.192.168.90.219.nip.io' @@ -18,6 +20,8 @@ global: msa-portal: enabled: true + cluster: + server: *clusterServer image: registry: *registry repository: msa-portal From 2c3c169629f1ee1ae04c4ab43020e2c890a88aed Mon Sep 17 00:00:00 2001 From: lhwang Date: Thu, 22 Feb 2024 17:40:17 +0800 Subject: [PATCH 3/3] To remove the component crd for compatibility with u4a 5.7 --- .../msa-portal/templates/component.yaml | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 charts/tmf-component/charts/msa-portal/templates/component.yaml diff --git a/charts/tmf-component/charts/msa-portal/templates/component.yaml b/charts/tmf-component/charts/msa-portal/templates/component.yaml deleted file mode 100644 index 5a13c5e..0000000 --- a/charts/tmf-component/charts/msa-portal/templates/component.yaml +++ /dev/null @@ -1,20 +0,0 @@ -{{- if .Values.global.host -}} -apiVersion: component.t7d.io/v1beta1 -kind: Component -metadata: - name: tmf - labels: - {{- include "tmf.portal.labels" . | nindent 4 }} -spec: - application: - helmChart: - name: tmf-helm-chart - valuesConfig: there is the value of helm values.yaml - version: v0.0.1 - name: tmf - menu: - name: tmf-root-menu - portal: - entry: /msa-public/public/index.html - path: /msa -{{- end -}} \ No newline at end of file