From e4e4371e60a13a9f7db74567b03abdcd188c473a Mon Sep 17 00:00:00 2001 From: Bharath Nallapeta Date: Wed, 4 Oct 2023 15:10:25 +0000 Subject: [PATCH 1/4] Modify ghcr login to use stakater token instead of user token (#537) Co-authored-by: Karl-Johan Grahn <6355577+karl-johan-grahn@users.noreply.github.com> --- .github/workflows/push.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index dd831d7d..3aad10e9 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -115,8 +115,8 @@ jobs: uses: docker/login-action@v2 with: registry: ${{env.REGISTRY}} - username: ${{github.actor}} - password: ${{secrets.GITHUB_TOKEN}} + username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }} + password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }} - name: Generate image repository path for ghcr registry run: | From f9d02d76effb1e7212230e51e39fd65e18bf6ba0 Mon Sep 17 00:00:00 2001 From: Muneeb Aijaz <43588696+MuneebAijaz@users.noreply.github.com> Date: Thu, 5 Oct 2023 11:42:23 +0500 Subject: [PATCH 2/4] Revert "Modify ghcr login to use stakater token instead of user token (#537)" This reverts commit e4e4371e60a13a9f7db74567b03abdcd188c473a. --- .github/workflows/push.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 3aad10e9..dd831d7d 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -115,8 +115,8 @@ jobs: uses: docker/login-action@v2 with: registry: ${{env.REGISTRY}} - username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }} - password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }} + username: ${{github.actor}} + password: ${{secrets.GITHUB_TOKEN}} - name: Generate image repository path for ghcr registry run: | From 37a4e83ffbd5a0558d25f9f58b85d05b99c8dd3f Mon Sep 17 00:00:00 2001 From: Muneeb Aijaz <43588696+MuneebAijaz@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:08:12 +0500 Subject: [PATCH 3/4] Update push.yaml --- .github/workflows/push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index dd831d7d..e10c7c82 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -115,7 +115,7 @@ jobs: uses: docker/login-action@v2 with: registry: ${{env.REGISTRY}} - username: ${{github.actor}} + username: stakater-user password: ${{secrets.GITHUB_TOKEN}} - name: Generate image repository path for ghcr registry From cf0fa2c24420eb11fcd05f04c14146531e7de10e Mon Sep 17 00:00:00 2001 From: stakater-user Date: Fri, 6 Oct 2023 06:30:26 +0000 Subject: [PATCH 4/4] [skip-ci] Update artifacts --- deployments/kubernetes/chart/reloader/Chart.yaml | 4 ++-- .../kubernetes/chart/reloader/values.yaml | 4 ++-- .../kubernetes/manifests/clusterrole.yaml | 2 +- .../kubernetes/manifests/clusterrolebinding.yaml | 2 +- deployments/kubernetes/manifests/deployment.yaml | 10 +++++----- .../kubernetes/manifests/serviceaccount.yaml | 2 +- deployments/kubernetes/reloader.yaml | 16 ++++++++-------- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/Chart.yaml b/deployments/kubernetes/chart/reloader/Chart.yaml index a9bfa057..3cb27d94 100644 --- a/deployments/kubernetes/chart/reloader/Chart.yaml +++ b/deployments/kubernetes/chart/reloader/Chart.yaml @@ -3,8 +3,8 @@ apiVersion: v1 name: reloader description: Reloader chart that runs on kubernetes -version: 1.0.41 -appVersion: v1.0.41 +version: 1.0.42 +appVersion: v1.0.42 keywords: - Reloader - kubernetes diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index 49e88dcd..dd32e979 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -84,10 +84,10 @@ reloader: labels: provider: stakater group: com.stakater.platform - version: v1.0.41 + version: v1.0.42 image: name: ghcr.io/stakater/reloader - tag: v1.0.41 + tag: v1.0.42 pullPolicy: IfNotPresent # Support for extra environment variables. env: diff --git a/deployments/kubernetes/manifests/clusterrole.yaml b/deployments/kubernetes/manifests/clusterrole.yaml index 1dad56bb..8303406c 100644 --- a/deployments/kubernetes/manifests/clusterrole.yaml +++ b/deployments/kubernetes/manifests/clusterrole.yaml @@ -9,7 +9,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-1.0.41" + chart: "reloader-1.0.42" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" diff --git a/deployments/kubernetes/manifests/clusterrolebinding.yaml b/deployments/kubernetes/manifests/clusterrolebinding.yaml index 632f9405..4ff63de3 100644 --- a/deployments/kubernetes/manifests/clusterrolebinding.yaml +++ b/deployments/kubernetes/manifests/clusterrolebinding.yaml @@ -9,7 +9,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-1.0.41" + chart: "reloader-1.0.42" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" diff --git a/deployments/kubernetes/manifests/deployment.yaml b/deployments/kubernetes/manifests/deployment.yaml index 8e8d70cf..06fdbf9f 100644 --- a/deployments/kubernetes/manifests/deployment.yaml +++ b/deployments/kubernetes/manifests/deployment.yaml @@ -8,13 +8,13 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-1.0.41" + chart: "reloader-1.0.42" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.41 + version: v1.0.42 name: reloader-reloader namespace: default spec: @@ -28,16 +28,16 @@ spec: metadata: labels: app: reloader-reloader - chart: "reloader-1.0.41" + chart: "reloader-1.0.42" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.41 + version: v1.0.42 spec: containers: - - image: "ghcr.io/stakater/reloader:v1.0.41" + - image: "ghcr.io/stakater/reloader:v1.0.42" imagePullPolicy: IfNotPresent name: reloader-reloader diff --git a/deployments/kubernetes/manifests/serviceaccount.yaml b/deployments/kubernetes/manifests/serviceaccount.yaml index ca14a6c0..9bb16eb2 100644 --- a/deployments/kubernetes/manifests/serviceaccount.yaml +++ b/deployments/kubernetes/manifests/serviceaccount.yaml @@ -8,7 +8,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-1.0.41" + chart: "reloader-1.0.42" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" diff --git a/deployments/kubernetes/reloader.yaml b/deployments/kubernetes/reloader.yaml index ac012b5b..4e047a6c 100644 --- a/deployments/kubernetes/reloader.yaml +++ b/deployments/kubernetes/reloader.yaml @@ -8,7 +8,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-1.0.41" + chart: "reloader-1.0.42" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" @@ -25,7 +25,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-1.0.41" + chart: "reloader-1.0.42" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" @@ -79,7 +79,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-1.0.41" + chart: "reloader-1.0.42" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" @@ -102,13 +102,13 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-1.0.41" + chart: "reloader-1.0.42" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.41 + version: v1.0.42 name: reloader-reloader namespace: default spec: @@ -122,16 +122,16 @@ spec: metadata: labels: app: reloader-reloader - chart: "reloader-1.0.41" + chart: "reloader-1.0.42" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.41 + version: v1.0.42 spec: containers: - - image: "ghcr.io/stakater/reloader:v1.0.41" + - image: "ghcr.io/stakater/reloader:v1.0.42" imagePullPolicy: IfNotPresent name: reloader-reloader