ci: misc fixes post 1.1.0

ubc · Jul 21, 2021 · 0a2e5ec · 0a2e5ec
1 parent 3463eee
commit 0a2e5ec
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 25 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -77,16 +77,11 @@ jobs:
 
       - name: Install chart publishing dependencies (chartpress, helm)
         run: |
-          . ./ci/common
-          setup_helm
-          helm version
-
-          # FIXME: six is required by docker 5.0.0 but isn't explicitly required
-          #        https://github.com/docker/docker-py/issues/2807
-          #
-          pip install chartpress pyyaml six
+          pip install chartpress pyyaml
           pip list
 
+          helm version
+
       - name: Setup push rights to jupyterhub/helm-chart
         # This was setup by...
         # 1. Generating a private/public key pair:

diff --git a/.github/workflows/test-chart.yaml b/.github/workflows/test-chart.yaml
@@ -33,10 +33,7 @@ jobs:
           python-version: "3.8"
 
       - name: Install dependencies
-        run: |
-          . ci/common
-          setup_helm
-          pip install chartpress yamllint
+        run: pip install chartpress yamllint
 
       - uses: pre-commit/[email protected]
         with:
@@ -152,20 +149,16 @@ jobs:
           - k3s-channel: v1.19
             test: upgrade
             upgrade-from: stable
-            # FIXME: After z2jh 1.1.0 release, remove the proxy tag pin
             upgrade-from-extra-args: >-
               --set proxy.secretToken=aaaa1111
               --set hub.cookieSecret=bbbb2222
               --set hub.config.CryptKeeper.keys[0]=cccc3333
-              --set proxy.chp.image.tag=4.5.0
             create-k8s-test-resources: true
           - k3s-channel: v1.19
             test: upgrade
             upgrade-from: dev
-            # FIXME: After z2jh 1.1.0 release, remove the proxy tag pin
             upgrade-from-extra-args: >-
               --set proxy.secretToken=aaaa1111
-              --set proxy.chp.image.tag=4.5.0
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/test-docker-build.yaml b/.github/workflows/test-docker-build.yaml
@@ -35,11 +35,7 @@ jobs:
           python-version: "3.8"
 
       - name: Install chartpress
-        run: |
-          # FIXME: six is required by docker 5.0.0 but isn't explicitly required
-          #        https://github.com/docker/docker-py/issues/2807
-          #
-          pip install chartpress six
+        run: pip install chartpress
 
       - name: Set up QEMU (for docker buildx)
         uses: docker/setup-qemu-action@27d0a4f181a40b142cce983c5393082c365d1480 # dependabot updates to latest release

diff --git a/dev-config.yaml b/dev-config.yaml
@@ -46,10 +46,7 @@ hub:
     test-explicit-name:
       name: some-explicitly-set-name
       apiToken: eeee5555
-    # FIXME: add this test at a later time, after 1.1.0, when upgrade tests
-    #        won't break because previous versions doesn't have support for this
-    #        config when this was added.
-    # test-generation-of-apiToken: {}
+    test-generation-of-apiToken: {}
   networkPolicy:
     egress: # overrides allowance of 0.0.0.0/0
       # In kind/k3s clusters the Kubernetes API server is exposing this port