Merge pull request #2833 from manics/aws-curvenote-tigera-chartpress

curvenote: Add tigera-operator namespace chart to chartpress

Author: manics

.github/workflows/cd.yml

@@ -151,7 +151,7 @@ jobs:
       - name: "Stage 1: Install and setup helm ${{ env.HELM_VERSION }}"
         run: |
           curl -sf https://raw.githubusercontent.com/helm/helm/HEAD/scripts/get-helm-3 | DESIRED_VERSION=${HELM_VERSION} bash
-          for d in ./mybinder/ ./system-charts/*/; do
+          for d in ./mybinder*/; do
             helm dependency update "$d"
           done
 
@@ -310,7 +310,7 @@ jobs:
       - name: "Stage 1: Install and setup helm ${{ env.HELM_VERSION }}"
         run: |
           curl -sf https://raw.githubusercontent.com/helm/helm/HEAD/scripts/get-helm-3 | DESIRED_VERSION=${HELM_VERSION} bash
-          for d in ./mybinder/ ./system-charts/*/; do
+          for d in ./mybinder*/; do
             helm dependency update "$d"
           done
 

.gitignore

@@ -8,12 +8,9 @@ __pycache__
 config/common/datacenter-*.yaml
 secrets/banned_hosts.txt
 secrets/config/common/bans.yaml
-system-charts/*/charts
-system-charts/*/requirements.lock
-system-charts/*/Chart.lock
-mybinder/charts
-mybinder/requirements.lock
-mybinder/Chart.lock
+mybinder*/charts
+mybinder*/requirements.lock
+mybinder*/Chart.lock
 
 .ipynb_checkpoints
 

chartpress.yaml

@@ -11,3 +11,4 @@ charts:
       tc-init:
         valuesPath: binderhub.jupyterhub.singleuser.initContainers.0.image
   - name: mybinder-kube-system
+  - name: mybinder-tigera-operator

deploy.py

@@ -336,11 +336,11 @@ def deploy_system_charts(release, name=None, dry_run=False):
     if not name:
         name = release
 
-    charts = glob.glob("system-charts/*/Chart.yaml")
-    namespaces = [c.split("/")[1] for c in charts]
+    charts = ["mybinder-kube-system", "mybinder-tigera-operator"]
 
-    for ns in namespaces:
-        log_name = f"mybinder-{ns} {release}"
+    for chart in charts:
+        log_name = f"{chart} {release}"
+        ns = chart[9:]
 
         config_files = get_config_files(release, config_dir=f"system-config/{ns}")
         if not config_files:
@@ -358,7 +358,7 @@ def deploy_system_charts(release, name=None, dry_run=False):
             f"--namespace={ns}",
             "--create-namespace",
             name,
-            f"system-charts/{ns}",
+            chart,
         ]
         for config_file in config_files:
             helm.extend(["-f", config_file])