Refactor datacenter values (#123)

* Add public vp bucket as image source bucket * Change grafana and kafka urls to use localclusterdomain variable The .Values.global.localClusterDomain variable is exposed through the vp framework (vp operator) Change to use that, so we can remove the additional (redundant) variables from values-global.yaml * Remove deprecated values from values global
validatedpatterns · Nov 25, 2024 · 4fc5c19 · 4fc5c19
1 parent 1109df5
commit 4fc5c19
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/charts/all/medical-diagnosis/grafana/templates/xraylab-dashboard.yaml b/charts/all/medical-diagnosis/grafana/templates/xraylab-dashboard.yaml
@@ -366,7 +366,7 @@ spec:
           "timeShift": null,
           "title": "Last uploaded image",
           "type": "ryantxu-ajax-panel",
-          "url": "https://image-server-xraylab-1.apps.{{ .Values.global.datacenter.clustername }}.{{ .Values.global.datacenter.domain }}/last_image_small/{{ .Values.global.xraylab.s3.bucketBaseName }}",
+          "url": "https://image-server-xraylab-1.{{ .Values.global.localClusterDomain }}/last_image_small/{{ .Values.global.xraylab.s3.bucketBaseName }}",
           "withCredentials": false
         },
         {
@@ -490,7 +490,7 @@ spec:
           "timeShift": null,
           "title": "Last processed image",
           "type": "ryantxu-ajax-panel",
-          "url": "https://image-server-xraylab-1.apps.{{ .Values.global.datacenter.clustername }}.{{ .Values.global.datacenter.domain }}/last_image_small/{{ .Values.global.xraylab.s3.bucketBaseName }}-processed",
+          "url": "https://image-server-xraylab-1.{{ .Values.global.localClusterDomain }}/last_image_small/{{ .Values.global.xraylab.s3.bucketBaseName }}-processed",
           "withCredentials": false
         },
         {
@@ -936,7 +936,7 @@ spec:
           "timeShift": null,
           "title": "Last anonymized image",
           "type": "ryantxu-ajax-panel",
-          "url": "https://image-server-xraylab-1.apps.{{ .Values.global.datacenter.clustername }}.{{ .Values.global.datacenter.domain }}/last_image_small/{{ .Values.global.xraylab.s3.bucketBaseName }}-anonymized",
+          "url": "https://image-server-xraylab-1.{{ .Values.global.localClusterDomain }}/last_image_small/{{ .Values.global.xraylab.s3.bucketBaseName }}-anonymized",
           "withCredentials": false
         },
         {

diff --git a/charts/all/medical-diagnosis/grafana/templates/xraylab-images-dashboard.yaml b/charts/all/medical-diagnosis/grafana/templates/xraylab-images-dashboard.yaml
@@ -68,7 +68,7 @@ spec:
           "timeShift": null,
           "title": "Last uploaded image",
           "type": "ryantxu-ajax-panel",
-          "url": "https://image-server-xraylab-1.apps.{{ .Values.global.datacenter.clustername }}.{{ .Values.global.datacenter.domain }}/last_image_big/{{ .Values.global.xraylab.s3.bucketBaseName }}",
+          "url": "https://image-server-xraylab-1.{{ .Values.global.localClusterDomain }}/last_image_big/{{ .Values.global.xraylab.s3.bucketBaseName }}",
           "withCredentials": false
         },
         {
@@ -98,7 +98,7 @@ spec:
           "timeShift": null,
           "title": "Last processed image",
           "type": "ryantxu-ajax-panel",
-          "url": "https://image-server-xraylab-1.apps.{{ .Values.global.datacenter.clustername }}.{{ .Values.global.datacenter.domain }}/last_image_big/{{ .Values.global.xraylab.s3.bucketBaseName }}-processed",
+          "url": "https://image-server-xraylab-1.{{ .Values.global.localClusterDomain }}/last_image_big/{{ .Values.global.xraylab.s3.bucketBaseName }}-processed",
           "withCredentials": false
         },
         {
@@ -128,7 +128,7 @@ spec:
           "timeShift": null,
           "title": "Last anonymized image",
           "type": "ryantxu-ajax-panel",
-          "url": "https://image-server-xraylab-1.apps.{{ .Values.global.datacenter.clustername }}.{{ .Values.global.datacenter.domain }}/last_image_big/{{ .Values.global.xraylab.s3.bucketBaseName }}-anonymized",
+          "url": "https://image-server-xraylab-1.{{ .Values.global.localClusterDomain }}/last_image_big/{{ .Values.global.xraylab.s3.bucketBaseName }}-anonymized",
           "withCredentials": false
         }
       ],

diff --git a/charts/all/medical-diagnosis/xray-init/templates/riskAssessment/kafkaservice.yaml b/charts/all/medical-diagnosis/xray-init/templates/riskAssessment/kafkaservice.yaml
@@ -7,7 +7,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "-4"
 data:
   url: "{{ .Values.kafkaSource.serviceOdfUrl }}"
-  url-external: "{{ .Values.kafkaSource.externalOdfUrl }}.apps.{{ .Values.global.datacenter.clustername }}.{{ .Values.global.datacenter.domain }}"
+  url-external: "{{ .Values.kafkaSource.externalOdfUrl }}.{{ .Values.global.localClusterDomain }}"
 ---
 apiVersion: serving.knative.dev/v1
 kind: Service

diff --git a/values-global.yaml b/values-global.yaml
@@ -7,19 +7,15 @@ global:
     installPlanApproval: Automatic
 
   datacenter:
-    cloudProvider: PROVIDE_CLOUDPROVIDER
-    storageClassName: PROVIDE_STORAGECLASS_NAME
-    region: PROVIDE_REGION
-    clustername: PROVIDE_CLUSTERNAME
-    domain: PROVIDE_DOMAIN
+    storageClassName: gp3-csi
 
   xraylab:
     namespace: "xraylab-1"
 
     s3:
       # Values for S3 bucket access
       # bucketSource: "provide s3 bucket name where images are stored"
-      bucketSource: PROVIDE_BUCKETSOURCE
+      bucketSource: validated-patterns-md-xray
       # Bucket base name used for image-generator and image-server applications.
       bucketBaseName: "xray-source"