From 6df09b25392ddfae03ed3d727531c8fa11b746b1 Mon Sep 17 00:00:00 2001 From: Muneeb Aijaz <43588696+MuneebAijaz@users.noreply.github.com> Date: Wed, 25 Oct 2023 13:32:31 +0500 Subject: [PATCH 1/3] Fix ubi push step --- .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 4c7a02b..5650fc7 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -163,7 +163,7 @@ jobs: uses: docker/build-push-action@v4 with: context: . - file: ${{ env.DOCKER_FILE_PATH }} + file: ${{ env.DOCKER_UBI_FILE_PATH }} pull: true push: true build-args: | From ccde739e0da9d276a362122d583825811fe12f93 Mon Sep 17 00:00:00 2001 From: MuneebAijaz Date: Wed, 25 Oct 2023 13:41:59 +0500 Subject: [PATCH 2/3] fixes for ubi --- .github/workflows/pull_request.yaml | 4 ++-- .github/workflows/push.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 828879a..ff37fa8 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -7,7 +7,7 @@ on: env: DOCKER_FILE_PATH: Dockerfile - UBI_DOCKER_FILE_PATH: Dockerfile.ubi + DOCKER_UBI_FILE_PATH: Dockerfile.ubi KUBERNETES_VERSION: "1.19.0" KIND_VERSION: "0.17.0" REGISTRY: ghcr.io @@ -181,7 +181,7 @@ jobs: push: true build-args: | BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }} - BUILDER_IMAGE=ghcr.io/${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }} + BUILDER_IMAGE=${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }} cache-to: type=inline platforms: linux/amd64,linux/arm64 tags: | diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 5650fc7..d60b580 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -168,7 +168,7 @@ jobs: push: true build-args: | BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }} - BUILDER_IMAGE=ghcr.io/${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }} + BUILDER_IMAGE=${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }} cache-to: type=inline platforms: linux/amd64,linux/arm64 tags: | From f1bef883a1686b101623d23a7efd815d6c173bce Mon Sep 17 00:00:00 2001 From: stakater-user Date: Wed, 25 Oct 2023 09:11:36 +0000 Subject: [PATCH 3/3] [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 01bb582..45f7531 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.46 -appVersion: v1.0.46 +version: 1.0.47 +appVersion: v1.0.47 keywords: - Reloader - kubernetes diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index c7a2732..c2b18bf 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.46 + version: v1.0.47 image: name: ghcr.io/stakater/reloader - tag: v1.0.46 + tag: v1.0.47 pullPolicy: IfNotPresent # Support for extra environment variables. env: diff --git a/deployments/kubernetes/manifests/clusterrole.yaml b/deployments/kubernetes/manifests/clusterrole.yaml index 1a95d32..7c94396 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.46" + chart: "reloader-1.0.47" 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 b248045..687c392 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.46" + chart: "reloader-1.0.47" 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 b489ceb..8937be0 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.46" + chart: "reloader-1.0.47" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.46 + version: v1.0.47 name: reloader-reloader namespace: default spec: @@ -28,16 +28,16 @@ spec: metadata: labels: app: reloader-reloader - chart: "reloader-1.0.46" + chart: "reloader-1.0.47" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.46 + version: v1.0.47 spec: containers: - - image: "ghcr.io/stakater/reloader:v1.0.46" + - image: "ghcr.io/stakater/reloader:v1.0.47" imagePullPolicy: IfNotPresent name: reloader-reloader diff --git a/deployments/kubernetes/manifests/serviceaccount.yaml b/deployments/kubernetes/manifests/serviceaccount.yaml index b758a43..d0699cc 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.46" + chart: "reloader-1.0.47" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" diff --git a/deployments/kubernetes/reloader.yaml b/deployments/kubernetes/reloader.yaml index de64a98..27d86d2 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.46" + chart: "reloader-1.0.47" 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.46" + chart: "reloader-1.0.47" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" @@ -92,7 +92,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-1.0.46" + chart: "reloader-1.0.47" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" @@ -115,13 +115,13 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-1.0.46" + chart: "reloader-1.0.47" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.46 + version: v1.0.47 name: reloader-reloader namespace: default spec: @@ -135,16 +135,16 @@ spec: metadata: labels: app: reloader-reloader - chart: "reloader-1.0.46" + chart: "reloader-1.0.47" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.46 + version: v1.0.47 spec: containers: - - image: "ghcr.io/stakater/reloader:v1.0.46" + - image: "ghcr.io/stakater/reloader:v1.0.47" imagePullPolicy: IfNotPresent name: reloader-reloader