From ca52b42c33a16365bb741f5b0ba710ba5fdb1bc7 Mon Sep 17 00:00:00 2001 From: rconway Date: Tue, 22 Aug 2023 17:28:49 +0000 Subject: [PATCH] Commit triggered by a change on the main branch of helm-charts-dev --- charts/application-hub/Chart.yaml | 2 +- charts/application-hub/files/hub/config.yml | 20 ++++++++++---------- charts/application-hub/values.yaml | 4 +++- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/charts/application-hub/Chart.yaml b/charts/application-hub/Chart.yaml index fd2cd66..366cc78 100644 --- a/charts/application-hub/Chart.yaml +++ b/charts/application-hub/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.0.48 +version: 2.0.49 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/application-hub/files/hub/config.yml b/charts/application-hub/files/hub/config.yml index b1452d9..d73a2a6 100644 --- a/charts/application-hub/files/hub/config.yml +++ b/charts/application-hub/files/hub/config.yml @@ -41,8 +41,8 @@ profiles: name: volume-workspace mount_path: "/workspace" persist: true - node_selector: - node-role.kubernetes.io/worker: "true" + node_selector: + {{ .Values.nodeSelector.key }}: {{ .Values.nodeSelector.value }} - id: profile_studio_stac_browser_planet groups: @@ -59,7 +59,7 @@ profiles: pod_env_vars: STAC_URL: "https://raw.githubusercontent.com/cholmes/sample-stac/master/stac/catalog.json" node_selector: - node-role.kubernetes.io/worker: "true" + {{ .Values.nodeSelector.key }}: {{ .Values.nodeSelector.value }} config_maps: - name: aws-credentials key: aws-credentials @@ -104,7 +104,7 @@ profiles: STAC_URL: "https://api.radiant.earth/mlhub/v1/" AUTH_CONFIG: "{ type: 'query', key: 'key', description: 'Please get the API key from your [Radiant MLHub Profile](https://mlhub.earth/profile).'}" node_selector: - node-role.kubernetes.io/worker: "true" + {{ .Values.nodeSelector.key }}: {{ .Values.nodeSelector.value }} config_maps: - name: aws-credentials key: aws-credentials @@ -146,7 +146,7 @@ profiles: image: eoepca/iga-remote-desktop:develop default_url: "desktop" node_selector: - node-role.kubernetes.io/worker: "true" + {{ .Values.nodeSelector.key }}: {{ .Values.nodeSelector.value }} config_maps: - name: aws-credentials key: aws-credentials @@ -188,7 +188,7 @@ profiles: image: eoepca/iga-remote-desktop-snap:develop default_url: "desktop" node_selector: - node-role.kubernetes.io/worker: "true" + {{ .Values.nodeSelector.key }}: {{ .Values.nodeSelector.value }} config_maps: - name: aws-credentials key: aws-credentials @@ -230,7 +230,7 @@ profiles: image: eoepca/iga-remote-desktop-qgis:develop default_url: "desktop" node_selector: - node-role.kubernetes.io/worker: "true" + {{ .Values.nodeSelector.key }}: {{ .Values.nodeSelector.value }} config_maps: - name: aws-credentials key: aws-credentials @@ -271,7 +271,7 @@ profiles: mem_limit: 4G image: eoepca/iga-streamlit-demo:develop node_selector: - node-role.kubernetes.io/worker: "true" + {{ .Values.nodeSelector.key }}: {{ .Values.nodeSelector.value }} config_maps: - name: aws-credentials key: aws-credentials @@ -351,7 +351,7 @@ profiles: A: 10 B: 20 node_selector: - node-role.kubernetes.io/worker: "true" + {{ .Values.nodeSelector.key }}: {{ .Values.nodeSelector.value }} - id: profile_studio_coder groups: @@ -365,7 +365,7 @@ profiles: mem_limit: 8G image: eoepca/pde-code-server@sha256:98b77ef39830aec162d9a30311957a48f2b4010930e999969656db11fa788a1b node_selector: - node-role.kubernetes.io/worker: "true" + {{ .Values.nodeSelector.key }}: {{ .Values.nodeSelector.value }} volumes: - name: volume-workspace claim_name: claim-dev diff --git a/charts/application-hub/values.yaml b/charts/application-hub/values.yaml index a680beb..a85e137 100644 --- a/charts/application-hub/values.yaml +++ b/charts/application-hub/values.yaml @@ -59,7 +59,9 @@ autoscaling: targetCPUUtilizationPercentage: 80 # targetMemoryUtilizationPercentage: 80 -nodeSelector: {} +nodeSelector: + key: node-role.kubernetes.io/worker + value: \"true\" tolerations: []