From b392bafa1c33b10fd823599671c33ff1efbb933f Mon Sep 17 00:00:00 2001 From: zhujian Date: Mon, 4 Mar 2024 16:49:19 +0800 Subject: [PATCH 1/3] Remove container-registry-secret Signed-off-by: zhujian --- .tekton/managed-serviceaccount-zbkr-pull-request.yaml | 8 -------- .tekton/managed-serviceaccount-zbkr-push.yaml | 8 -------- 2 files changed, 16 deletions(-) diff --git a/.tekton/managed-serviceaccount-zbkr-pull-request.yaml b/.tekton/managed-serviceaccount-zbkr-pull-request.yaml index 5433747..d69da38 100644 --- a/.tekton/managed-serviceaccount-zbkr-pull-request.yaml +++ b/.tekton/managed-serviceaccount-zbkr-pull-request.yaml @@ -177,8 +177,6 @@ spec: value: $(params.dockerfile) - name: CONTEXT value: $(params.path-context) - - name: DOCKER_AUTH - value: $(tasks.init.results.container-registry-secret) - name: HERMETIC value: $(params.hermetic) - name: PREFETCH_INPUT @@ -204,8 +202,6 @@ spec: value: $(tasks.build-container.results.IMAGE_URL) - name: IMAGE_DIGEST value: $(tasks.build-container.results.IMAGE_DIGEST) - - name: DOCKER_AUTH - value: $(tasks.init.results.container-registry-secret) runAfter: - build-container taskRef: @@ -271,8 +267,6 @@ spec: value: $(tasks.build-container.results.IMAGE_DIGEST) - name: image-url value: $(tasks.build-container.results.IMAGE_URL) - - name: docker-auth - value: $(tasks.init.results.container-registry-secret) runAfter: - build-container taskRef: @@ -310,8 +304,6 @@ spec: value: $(tasks.build-container.results.IMAGE_DIGEST) - name: image-url value: $(tasks.build-container.results.IMAGE_URL) - - name: docker-auth - value: $(tasks.init.results.container-registry-secret) runAfter: - build-container taskRef: diff --git a/.tekton/managed-serviceaccount-zbkr-push.yaml b/.tekton/managed-serviceaccount-zbkr-push.yaml index 67bffdb..e7738b3 100644 --- a/.tekton/managed-serviceaccount-zbkr-push.yaml +++ b/.tekton/managed-serviceaccount-zbkr-push.yaml @@ -174,8 +174,6 @@ spec: value: $(params.dockerfile) - name: CONTEXT value: $(params.path-context) - - name: DOCKER_AUTH - value: $(tasks.init.results.container-registry-secret) - name: HERMETIC value: $(params.hermetic) - name: PREFETCH_INPUT @@ -201,8 +199,6 @@ spec: value: $(tasks.build-container.results.IMAGE_URL) - name: IMAGE_DIGEST value: $(tasks.build-container.results.IMAGE_DIGEST) - - name: DOCKER_AUTH - value: $(tasks.init.results.container-registry-secret) runAfter: - build-container taskRef: @@ -268,8 +264,6 @@ spec: value: $(tasks.build-container.results.IMAGE_DIGEST) - name: image-url value: $(tasks.build-container.results.IMAGE_URL) - - name: docker-auth - value: $(tasks.init.results.container-registry-secret) runAfter: - build-container taskRef: @@ -307,8 +301,6 @@ spec: value: $(tasks.build-container.results.IMAGE_DIGEST) - name: image-url value: $(tasks.build-container.results.IMAGE_URL) - - name: docker-auth - value: $(tasks.init.results.container-registry-secret) runAfter: - build-container taskRef: From 28e895358fbe24df84d551823df163fc0ab6aeec Mon Sep 17 00:00:00 2001 From: zhujian Date: Mon, 4 Mar 2024 17:56:51 +0800 Subject: [PATCH 2/3] go mod tidy before build binaries Signed-off-by: zhujian --- Dockerfile.rhtap | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.rhtap b/Dockerfile.rhtap index e16fc87..44cb03d 100644 --- a/Dockerfile.rhtap +++ b/Dockerfile.rhtap @@ -2,6 +2,7 @@ FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.20 AS bui WORKDIR /go/src/github.com/open-cluster-management.io/managed-serviceaccount COPY . . RUN go env +RUN go mod tidy && go mod vendor RUN make build-manager RUN make build-agent From 742eef66a4b04dcca09bcc0850c4874f9b6c70d5 Mon Sep 17 00:00:00 2001 From: zhujian Date: Mon, 4 Mar 2024 18:12:56 +0800 Subject: [PATCH 3/3] remove workspace for deprecated-base-image-check Signed-off-by: zhujian --- .tekton/managed-serviceaccount-zbkr-pull-request.yaml | 3 --- .tekton/managed-serviceaccount-zbkr-push.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.tekton/managed-serviceaccount-zbkr-pull-request.yaml b/.tekton/managed-serviceaccount-zbkr-pull-request.yaml index d69da38..e7bebb6 100644 --- a/.tekton/managed-serviceaccount-zbkr-pull-request.yaml +++ b/.tekton/managed-serviceaccount-zbkr-pull-request.yaml @@ -258,9 +258,6 @@ spec: operator: in values: - "false" - workspaces: - - name: test-ws - workspace: workspace - name: clair-scan params: - name: image-digest diff --git a/.tekton/managed-serviceaccount-zbkr-push.yaml b/.tekton/managed-serviceaccount-zbkr-push.yaml index e7738b3..098c36d 100644 --- a/.tekton/managed-serviceaccount-zbkr-push.yaml +++ b/.tekton/managed-serviceaccount-zbkr-push.yaml @@ -255,9 +255,6 @@ spec: operator: in values: - "false" - workspaces: - - name: test-ws - workspace: workspace - name: clair-scan params: - name: image-digest