From b1b041cea6647fcb33d5f15b6e3636974f0e2252 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Tue, 13 Aug 2019 14:47:45 +0200 Subject: [PATCH] Stop pushing Helm operator images This commit has overlap with work done in #2329. We do however need to disable the push of images before we actually remove the code, to be able to safely switch to `master` in the `fluxcd/helm-operator` repository. As otherwise the prerelease images will have builds from mixed origins. --- .circleci/config.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index df56ea8d8..ed9db7c00 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -133,16 +133,10 @@ jobs: docker tag "docker.io/fluxcd/flux:$(docker/image-tag)" "docker.io/weaveworks/flux-prerelease:$(docker/image-tag)" docker push "docker.io/weaveworks/flux-prerelease:$(docker/image-tag)" - docker tag "docker.io/fluxcd/helm-operator:$(docker/image-tag)" "docker.io/weaveworks/helm-operator-prerelease:$(docker/image-tag)" - docker push "docker.io/weaveworks/helm-operator-prerelease:$(docker/image-tag)" - # Push to fluxcd org echo "$DOCKER_FLUXCD_PASSWORD" | docker login --username "$DOCKER_FLUXCD_USER" --password-stdin docker tag "docker.io/fluxcd/flux:$(docker/image-tag)" "docker.io/fluxcd/flux-prerelease:$(docker/image-tag)" docker push "docker.io/fluxcd/flux-prerelease:$(docker/image-tag)" - - docker tag "docker.io/fluxcd/helm-operator:$(docker/image-tag)" "docker.io/fluxcd/helm-operator-prerelease:$(docker/image-tag)" - docker push "docker.io/fluxcd/helm-operator-prerelease:$(docker/image-tag)" fi - deploy: name: Maybe push release image and upload binaries @@ -160,18 +154,6 @@ jobs: echo "$DOCKER_FLUXCD_PASSWORD" | docker login --username "$DOCKER_FLUXCD_USER" --password-stdin docker push "docker.io/fluxcd/flux:${CIRCLE_TAG}" fi - if echo "${CIRCLE_TAG}" | grep -Eq "helm-[0-9]+(\.[0-9]+)*(-[a-z]+)?$"; then - RELEASE_TAG=$(echo "$CIRCLE_TAG" | cut -c 6-) - - # Push to weaveworks org - echo "$DOCKER_REGISTRY_PASSWORD" | docker login --username "$DOCKER_REGISTRY_USER" --password-stdin - docker tag "docker.io/fluxcd/helm-operator:${RELEASE_TAG}" "docker.io/weaveworks/helm-operator:${RELEASE_TAG}" - docker push "docker.io/weaveworks/helm-operator:${RELEASE_TAG}" - - # Push to fluxcd org - echo "$DOCKER_FLUXCD_PASSWORD" | docker login --username "$DOCKER_FLUXCD_USER" --password-stdin - docker push "docker.io/fluxcd/helm-operator:${RELEASE_TAG}" - fi workflows: version: 2