diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 639f139..d8c5653 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 @@ -136,7 +136,7 @@ jobs: BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }} BUILDER_IMAGE=${{ env.DOCKER_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }} cache-to: type=inline - platforms: linux/amd64,linux/arm,linux/arm64 + platforms: linux/amd64,linux/arm64 tags: | ${{ env.DOCKER_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_UBI_TAG }} labels: | @@ -181,9 +181,9 @@ jobs: push: true build-args: | BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }} - BUILDER_IMAGE=${{ env.DOCKER_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/arm,linux/arm64 + platforms: linux/amd64,linux/arm64 tags: | ${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_UBI_TAG }} labels: | diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 39dfe70..dab5b62 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -121,9 +121,9 @@ jobs: push: true build-args: | BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }} - BUILDER_IMAGE= ${{ env.DOCKER_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }} + BUILDER_IMAGE=${{ env.DOCKER_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }} cache-to: type=inline - platforms: linux/amd64,linux/arm,linux/arm64 + platforms: linux/amd64,linux/arm64 tags: | ${{ env.DOCKER_IMAGE_REPOSITORY }}:ubi-${{ steps.generate_tag.outputs.new_tag }} labels: | @@ -163,14 +163,14 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: ${{ env.DOCKER_FILE_PATH }} + file: ${{ env.DOCKER_UBI_FILE_PATH }} pull: true push: true build-args: | BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }} - BUILDER_IMAGE= ${{ env.DOCKER_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/arm,linux/arm64 + platforms: linux/amd64,linux/arm64 tags: | ${{ env.GHCR_IMAGE_REPOSITORY }}:ubi-${{ steps.generate_tag.outputs.new_tag }} labels: | @@ -219,6 +219,15 @@ jobs: commit_email: stakater@gmail.com # Commit back changes + - name: Log info about `.git` directory permissions + run: | + # Debug logging + echo "Disk usage: " + df -H + + echo ".git files not owned by current user or current group:" + find .git ! -user $(id -u) -o ! -group $(id -g) | xargs ls -lah + - name: Commit files run: | git config --local user.email "stakater@gmail.com" diff --git a/Dockerfile.ubi b/Dockerfile.ubi index 43ce010..33d1348 100644 --- a/Dockerfile.ubi +++ b/Dockerfile.ubi @@ -1,9 +1,9 @@ ARG BUILDER_IMAGE ARG BASE_IMAGE -FROM ${BUILDER_IMAGE} as SRC +FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE} as SRC -FROM ${BASE_IMAGE:-registry.access.redhat.com/ubi8/ubi-minimal} +FROM ${BASE_IMAGE:-registry.access.redhat.com/ubi8/ubi-minimal:latest} WORKDIR / COPY --from=SRC /manager . diff --git a/deployments/kubernetes/chart/reloader/Chart.yaml b/deployments/kubernetes/chart/reloader/Chart.yaml index 01bb582..09791c4 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.48 +appVersion: v1.0.48 keywords: - Reloader - kubernetes diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index c7a2732..918a2c5 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.48 image: name: ghcr.io/stakater/reloader - tag: v1.0.46 + tag: v1.0.48 pullPolicy: IfNotPresent # Support for extra environment variables. env: diff --git a/deployments/kubernetes/manifests/clusterrole.yaml b/deployments/kubernetes/manifests/clusterrole.yaml index 1a95d32..6c35795 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.48" 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..998d0dc 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.48" 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..b78f548 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.48" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.46 + version: v1.0.48 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.48" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.46 + version: v1.0.48 spec: containers: - - image: "ghcr.io/stakater/reloader:v1.0.46" + - image: "ghcr.io/stakater/reloader:v1.0.48" imagePullPolicy: IfNotPresent name: reloader-reloader diff --git a/deployments/kubernetes/manifests/serviceaccount.yaml b/deployments/kubernetes/manifests/serviceaccount.yaml index b758a43..61e4aee 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.48" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" diff --git a/deployments/kubernetes/reloader.yaml b/deployments/kubernetes/reloader.yaml index de64a98..4273ab2 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.48" 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.48" 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.48" 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.48" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.46 + version: v1.0.48 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.48" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v1.0.46 + version: v1.0.48 spec: containers: - - image: "ghcr.io/stakater/reloader:v1.0.46" + - image: "ghcr.io/stakater/reloader:v1.0.48" imagePullPolicy: IfNotPresent name: reloader-reloader