From af99bb1d0cb16a1054442cb2121296032a5b9c99 Mon Sep 17 00:00:00 2001 From: shuting Date: Thu, 30 Mar 2023 19:09:40 +0800 Subject: [PATCH] update install.yaml (#6737) Signed-off-by: ShutingZhao --- Makefile | 30 ++++++++++++++++++++---------- config/install-latest-testing.yaml | 8 ++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index c8941ab538..5b8b0bca3d 100644 --- a/Makefile +++ b/Makefile @@ -413,14 +413,15 @@ image-build-all: $(BUILD_WITH)-build-all # CODEGEN # ########### -GOPATH_SHIM := ${PWD}/.gopath -PACKAGE_SHIM := $(GOPATH_SHIM)/src/$(PACKAGE) -OUT_PACKAGE := $(PACKAGE)/pkg/client -INPUT_DIRS := $(PACKAGE)/api/kyverno/v1,$(PACKAGE)/api/kyverno/v1alpha2,$(PACKAGE)/api/kyverno/v1beta1,$(PACKAGE)/api/kyverno/v2alpha1,$(PACKAGE)/api/policyreport/v1alpha2 -CLIENTSET_PACKAGE := $(OUT_PACKAGE)/clientset -LISTERS_PACKAGE := $(OUT_PACKAGE)/listers -INFORMERS_PACKAGE := $(OUT_PACKAGE)/informers -CRDS_PATH := ${PWD}/config/crds +GOPATH_SHIM := ${PWD}/.gopath +PACKAGE_SHIM := $(GOPATH_SHIM)/src/$(PACKAGE) +OUT_PACKAGE := $(PACKAGE)/pkg/client +INPUT_DIRS := $(PACKAGE)/api/kyverno/v1,$(PACKAGE)/api/kyverno/v1alpha2,$(PACKAGE)/api/kyverno/v1beta1,$(PACKAGE)/api/kyverno/v2alpha1,$(PACKAGE)/api/policyreport/v1alpha2 +CLIENTSET_PACKAGE := $(OUT_PACKAGE)/clientset +LISTERS_PACKAGE := $(OUT_PACKAGE)/listers +INFORMERS_PACKAGE := $(OUT_PACKAGE)/informers +CRDS_PATH := ${PWD}/config/crds +INSTALL_MANIFEST_PATH := ${PWD}/config/install-latest-testing.yaml $(GOPATH_SHIM): @echo Create gopath shim... >&2 @@ -527,7 +528,7 @@ codegen-manifest-install: $(HELM) ## Create install manifest --set reportsController.image.tag=latest \ --set backgroundController.image.tag=latest \ | $(SED) -e '/^#.*/d' \ - > ./.manifest/install-latest-testing.yaml.yaml + > ./.manifest/install-latest-testing.yaml .PHONY: codegen-manifest-install-latest codegen-manifest-install-latest: $(HELM) ## Create install_latest manifest @@ -633,8 +634,17 @@ verify-helm: codegen-helm-all ## Check Helm charts are up to date @echo 'To correct this, locally run "make codegen-helm-all", commit the changes, and re-run tests.' >&2 @git diff --quiet --exit-code charts +.PHONY: verify-manifests +verify-manifests: codegen-manifest-all ## Check manifests are up to date + @echo Checking manifests are up to date... >&2 + @git --no-pager diff ${INSTALL_MANIFEST_PATH} + @echo 'If this test fails, it is because the git diff is non-empty after running "make codegen-manifest-all".' >&2 + @echo 'To correct this, locally run "make codegen-manifest-all", commit the changes, and re-run tests.' >&2 + @git diff --quiet --exit-code ${INSTALL_MANIFEST_PATH} + + .PHONY: verify-codegen -verify-codegen: verify-crds verify-client verify-deepcopy verify-api-docs verify-helm codegen-manifest-all ## Verify all generated code and docs are up to date +verify-codegen: verify-crds verify-client verify-deepcopy verify-api-docs verify-helm verify-manifests ## Verify all generated code and docs are up to date ############## # UNIT TESTS # diff --git a/config/install-latest-testing.yaml b/config/install-latest-testing.yaml index fd8e2b100c..252b2557a7 100644 --- a/config/install-latest-testing.yaml +++ b/config/install-latest-testing.yaml @@ -33768,6 +33768,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: TUF_ROOT + value: /.sigstore resources: limits: memory: 128Mi @@ -33784,3 +33786,9 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault + volumeMounts: + - mountPath: /.sigstore + name: sigstore + volumes: + - name: sigstore + emptyDir: {}