Merge branch 'main' into revert-12340-fix-builder

kyma-project · Nov 14, 2024 · 003fa92 · 003fa92
2 parents 9fc4c4c + b2363ec
commit 003fa92
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/actions/image-builder/action.yml b/.github/actions/image-builder/action.yml
@@ -82,7 +82,7 @@ runs:
       id: prepare-tags
       shell: bash
     
-    - uses: docker://europe-docker.pkg.dev/kyma-project/prod/image-builder:v20241114-555ad37c
+    - uses: docker://europe-docker.pkg.dev/kyma-project/prod/image-builder:v20241114-d2198e03
       id: build
       with:
         args: --name=${{ inputs.image-name }} --context=${{ inputs.context }} --dockerfile=${{ inputs.dockerfile }} --azure-access-token=${{ inputs.ado-token }} --oidc-token=${{ inputs.oidc-token }} ${{ steps.prepare-build-args.outputs.build-args }} ${{ steps.prepare-tags.outputs.tags }} --export-tags=${{ inputs.export-tags }} --config=${{ inputs.config }} --env-file=${{ inputs.env-file }} --build-in-ado=true --use-go-internal-sap-modules=${{ inputs.use-go-internal-sap-modules }}
diff --git a/.github/workflows/pull-validate-kaniko-build-config.yml b/.github/workflows/pull-validate-kaniko-build-config.yml
@@ -50,7 +50,7 @@ jobs:
           secrets: |-
             ado-pat:${{ vars.GCP_KYMA_PROJECT_PROJECT_ID }}/${{ vars.IMAGE_BUILDER_ADO_PAT_GCP_SECRET_NAME }}
 
-      - uses: docker://europe-docker.pkg.dev/kyma-project/prod/image-builder:v20241114-555ad37c
+      - uses: docker://europe-docker.pkg.dev/kyma-project/prod/image-builder:v20241114-d2198e03
         id: build
         with:
           args: --name=test-infra/ginkgo --context=. --dockerfile=images/ginkgo/Dockerfile --azure-access-token=${{ steps.secrets.outputs.ado-pat }} --oidc-token=${{ steps.get_oidc.outputs.jwt }} --env-file='envs' --build-in-ado=true --test-kaniko-build-config=true --config="./configs/image-builder-client-config.yaml"
diff --git a/cmd/image-builder/main.go b/cmd/image-builder/main.go
@@ -838,7 +838,7 @@ func (o *options) gatherOptions(flagSet *flag.FlagSet) *flag.FlagSet {
 	flagSet.StringVar(&o.oidcToken, "oidc-token", "", "Token used to authenticate against Azure DevOps backend service")
 	flagSet.StringVar(&o.azureAccessToken, "azure-access-token", "", "Token used to authenticate against Azure DevOps API")
 	flagSet.StringVar(&o.tagsOutputFile, "tags-output-file", "/generated-tags.json", "Path to file where generated tags will be written as JSON")
-	flagSet.BoolVar(&o.useGoInternalSAPModules, "use-go-interna-sap-modules", false, "Allow access to Go internal modules in ADO backend")
+	flagSet.BoolVar(&o.useGoInternalSAPModules, "use-go-internal-sap-modules", false, "Allow access to Go internal modules in ADO backend")
 
 	return flagSet
 }