improvement(k8s): update in-cluster docker registry to 2.7.1

garden-io · May 11, 2020 · b95644c · b95644c
1 parent cfb5904
commit b95644c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 33 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -394,20 +394,6 @@ jobs:
           name: Cleanup
           command: CIRCLE_BUILD_NUM=$CIRCLE_BUILD_NUM-docker kubectl delete --wait=false $(kubectl get ns -o name | grep testing-$CIRCLE_BUILD_NUM) || true
           when: always
-  cleanup-cluster-registry:
-    docker:
-      - image: gardendev/garden-gcloud:${CIRCLE_SHA1}
-        environment:
-          <<: *shared-env-config
-          GARDEN_TASK_CONCURRENCY_LIMIT: "10"
-    steps:
-      # Need to checkout to run example project
-      - checkout
-      - configure_kubectl_context
-      - *attach-workspace
-      - run:
-          name: Run cluster cleanup
-          command: CIRCLE_BUILD_NUM=$CIRCLE_BUILD_NUM-docker /garden/garden plugins kubernetes cleanup-cluster-registry --root examples/demo-project --env remote --logger-type basic
   release-service-docker:
     <<: *node-config
     steps:
@@ -600,10 +586,13 @@ jobs:
           command: cd garden-service && npm run integ-local -- -b
       - run:
           name: Deploy demo-project
-          command: sudo -E ./garden-service/bin/garden deploy --root examples/demo-project --logger-type basic
+          command: sudo -E ./garden-service/bin/garden deploy --root examples/demo-project
       - run:
           name: Deploy openfaas
-          command: sudo -E ./garden-service/bin/garden deploy --root examples/openfaas --logger-type basic
+          command: sudo -E ./garden-service/bin/garden deploy --root examples/openfaas
+      - run:
+          name: Run cluster cleanup
+          command: sudo -E ./garden-service/bin/garden plugins local-kubernetes cleanup-cluster-registry --root examples/demo-project
 
   test-windows:
     executor: win/vs2019
@@ -765,22 +754,6 @@ workflows:
           project: vote-helm
           requires: [build]
 
-      - cleanup-cluster-registry:
-          <<: *only-internal-prs
-          context: docker
-          requires:
-            - e2e-demo-project
-            - e2e-deployment-strategies
-            - e2e-hot-reload
-            - e2e-openfaas
-            - e2e-project-variables
-            - e2e-remote-sources
-            - e2e-tasks
-            - e2e-vote
-            - e2e-vote-helm
-            - test-docker-gcloud
-            - test-windows
-
       ### MASTER ONLY ###
 
       - build-dist-edge:

diff --git a/garden-service/static/kubernetes/system/docker-registry/garden.yml b/garden-service/static/kubernetes/system/docker-registry/garden.yml
@@ -4,7 +4,7 @@ name: docker-registry
 type: helm
 chart: stable/docker-registry
 releaseName: garden-docker-registry
-version: 1.8.3
+version: 1.9.2
 values:
   # This is to avoid a multi-attach error when updating
   updateStrategy: