From d048234d65f9e4af5b7ee1dbebe6b01d9ac909c1 Mon Sep 17 00:00:00 2001
From: Yann Hamon <yann.hamon@contentful.com>
Date: Thu, 23 Mar 2023 10:00:41 +0100
Subject: [PATCH 1/4] Use Github Actions / Github Packages

---
 .circleci/config.yml | 108 -------------------------------------------
 1 file changed, 108 deletions(-)
 delete mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 4c606d9..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-version: 2.1
-executors:
-  docker-publisher:
-    environment:
-      IMAGE_NAME: contentful/kube-secret-syncer
-    machine:
-      docker_layer_caching: true
-jobs:
-  test:
-    machine:
-      image: ubuntu-2204:2022.04.1
-    environment:
-    steps:
-      - checkout
-      - run: make docker-test
-  build:
-    executor: docker-publisher
-    steps:
-      - checkout
-      - run: make docker-build
-      - run:
-          name: Archive Docker image
-          command: docker save -o image.tar contentful-labs/kube-secret-syncer
-      - persist_to_workspace:
-          root: .
-          paths:
-            - ./image.tar
-  publish-branch:
-    executor: docker-publisher
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          name: Load archived Docker image
-          command: docker load -i /tmp/workspace/image.tar
-      - run:
-          name: publish docker image with branch
-          command: |
-            docker tag contentful-labs/kube-secret-syncer:latest $IMAGE_NAME:$CIRCLE_BRANCH
-            echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USER" --password-stdin
-            docker push $IMAGE_NAME:$CIRCLE_BRANCH
-  publish-tag:
-    executor: docker-publisher
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          name: Load archived Docker image
-          command: docker load -i /tmp/workspace/image.tar
-      - run:
-          name: publish docker image with tag
-          command: |
-            docker tag contentful-labs/kube-secret-syncer:latest $IMAGE_NAME:$CIRCLE_TAG
-            echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USER" --password-stdin
-            docker push $IMAGE_NAME:$CIRCLE_TAG
-  publish-master:
-    executor: docker-publisher
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          name: Load archived Docker image
-          command: docker load -i /tmp/workspace/image.tar
-      - run:
-          name: publish docker image with latest tag
-          command: |
-            docker tag contentful-labs/kube-secret-syncer:latest $IMAGE_NAME:latest
-            echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USER" --password-stdin
-            docker push $IMAGE_NAME:latest
-workflows:
-  version: 2
-  flow:
-    jobs:
-      - test:
-          filters:
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*(-.*)*/
-      - build:
-          filters:
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*(-.*)*/
-      - publish-branch:
-          requires:
-            - build
-            - test
-          filters:
-            branches:
-              ignore:
-                - master
-                - /pull\/[0-9]+/
-                - /dependabot.*/
-      - publish-tag:
-          #  Only run this job on git tag pushes
-          requires:
-            - build
-            - test
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*(-.*)*/
-      - publish-master:
-          requires:
-            - build
-            - test
-          filters:
-            branches:
-              only: master

From 5c318301e41f29db9b886eb5d4231f96ea21f14d Mon Sep 17 00:00:00 2001
From: Yann Hamon <yann.hamon@contentful.com>
Date: Thu, 23 Mar 2023 10:02:49 +0100
Subject: [PATCH 2/4] Use Github Actions / Github Packages

---
 .github/workflows/build.yml | 44 +++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..56d6ca2
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,44 @@
+name: build-push
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - '*'
+    tags:
+      - 'v*'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: test
+        run: make docker-test
+
+      - name: build
+        run: make docker-build
+
+      - name: Log in to GHCR
+        run: |
+          echo "${{ github.token }}" | docker login https://ghcr.io -u ${GITHUB_ACTOR} --password-stdin
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: publish-latest
+        run: |
+          docker tag contentful-labs/kube-sercret-syncer:latest ghcr.io/contentful-labs/kube-sercret-syncer:latest
+          docker push ghcr.io/contentful-labs/kube-sercret-syncer:latest
+        if: github.ref == 'refs/heads/master'
+
+      - name: publish-branch
+        run: |
+          docker tag contentful-labs/kube-sercret-syncer:latest ghcr.io/contentful-labs/kube-sercret-syncer:${GITHUB_REF##*/}
+          docker push ghcr.io/contentful-labs/kube-sercret-syncer:${GITHUB_REF##*/}
+        if: startsWith(github.ref, 'refs/heads/') && github.ref != 'refs/heads/master'
+
+      - name: publish-tag
+        run: |
+          docker tag contentful-labs/kube-sercret-syncer:latest ghcr.io/contentful-labs/kube-sercret-syncer:${GITHUB_REF##*/}
+          docker push ghcr.io/contentful-labs/kube-sercret-syncer:${GITHUB_REF##*/}
+        if: startsWith(github.ref, 'refs/tags/v')

From 1c4a0e73d5cd3ae3d10d77586c1a19a2d4f096a5 Mon Sep 17 00:00:00 2001
From: Yann Hamon <yann.hamon@contentful.com>
Date: Thu, 23 Mar 2023 10:05:38 +0100
Subject: [PATCH 3/4] Use Github Actions / Github Packages

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5b44295..53f78c7 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ generate: controller-gen
 # Run tests in a container
 docker-test:
 	docker build . -t ${IMG}-test --target=test
-	docker run -it -v $(PWD):/repo --rm ${IMG}-test go test -v ./... -coverprofile /repo/cover.out -coverpkg ./controllers/...,./pkg/...
+	docker run -t -v $(PWD):/repo --rm ${IMG}-test go test -v ./... -coverprofile /repo/cover.out -coverpkg ./controllers/...,./pkg/...
 
 # Build the docker image
 docker-build: 

From 285386d2314f3edf777b8039713f759bcdb48284 Mon Sep 17 00:00:00 2001
From: Yann Hamon <yann.hamon@contentful.com>
Date: Thu, 23 Mar 2023 10:15:14 +0100
Subject: [PATCH 4/4] Use Github Actions / Github Packages

---
 .github/workflows/build.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 56d6ca2..39078e5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,18 +27,18 @@ jobs:
 
       - name: publish-latest
         run: |
-          docker tag contentful-labs/kube-sercret-syncer:latest ghcr.io/contentful-labs/kube-sercret-syncer:latest
-          docker push ghcr.io/contentful-labs/kube-sercret-syncer:latest
+          docker tag contentful-labs/kube-secret-syncer:latest ghcr.io/contentful-labs/kube-secret-syncer:latest
+          docker push ghcr.io/contentful-labs/kube-secret-syncer:latest
         if: github.ref == 'refs/heads/master'
 
       - name: publish-branch
         run: |
-          docker tag contentful-labs/kube-sercret-syncer:latest ghcr.io/contentful-labs/kube-sercret-syncer:${GITHUB_REF##*/}
-          docker push ghcr.io/contentful-labs/kube-sercret-syncer:${GITHUB_REF##*/}
+          docker tag contentful-labs/kube-secret-syncer:latest ghcr.io/contentful-labs/kube-secret-syncer:${GITHUB_REF##*/}
+          docker push ghcr.io/contentful-labs/kube-secret-syncer:${GITHUB_REF##*/}
         if: startsWith(github.ref, 'refs/heads/') && github.ref != 'refs/heads/master'
 
       - name: publish-tag
         run: |
-          docker tag contentful-labs/kube-sercret-syncer:latest ghcr.io/contentful-labs/kube-sercret-syncer:${GITHUB_REF##*/}
-          docker push ghcr.io/contentful-labs/kube-sercret-syncer:${GITHUB_REF##*/}
+          docker tag contentful-labs/kube-secret-syncer:latest ghcr.io/contentful-labs/kube-secret-syncer:${GITHUB_REF##*/}
+          docker push ghcr.io/contentful-labs/kube-secret-syncer:${GITHUB_REF##*/}
         if: startsWith(github.ref, 'refs/tags/v')