mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

chore: fix workflows related to ko recent changes (#4438)

Browse source 
Signed-off-by: Charles-Edouard Brétéché <charled.breteche@gmail.com>

Signed-off-by: Charles-Edouard Brétéché <charled.breteche@gmail.com>
Co-authored-by: Prateek Pandey <prateek.pandey@nirmata.com>
This commit is contained in:
Charles-Edouard Brétéché 2022-08-30 06:59:08 +02:00 • committed by GitHub
parent 1f6e7b17ce
commit 2b495c7ef3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/image-build.yaml vendored
View file

@ -84,7 +84,7 @@ jobs:
${{ runner.os }}-go- ${{ runner.os }}-go-
- name: ko build - name: ko build
run: REGISTRY=ghcr.io/${{github.repository}} make ko-build-initContainer run: make ko-build-initContainer-local
build-kyverno: build-kyverno:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -110,7 +110,7 @@ jobs:
${{ runner.os }}-go- ${{ runner.os }}-go-
- name: ko build - name: ko build
run: REGISTRY=ghcr.io/${{github.repository}} make ko-build-kyverno run: make ko-build-kyverno-local
- name: Trivy Scan Image - name: Trivy Scan Image
uses: aquasecurity/trivy-action@40c4ca9e7421287d0c5576712fdff370978f9c3c uses: aquasecurity/trivy-action@40c4ca9e7421287d0c5576712fdff370978f9c3c
@ -145,4 +145,4 @@ jobs:
${{ runner.os }}-go- ${{ runner.os }}-go-
- name: ko build - name: ko build
run: REGISTRY=ghcr.io/${{github.repository}} make ko-build-cli run: make ko-build-cli-local

2
.github/workflows/reuse.yaml vendored
View file

@ -106,7 +106,7 @@ jobs:
id: ko-build-dev id: ko-build-dev
if: ${{inputs.tag == 'image' && steps.extract_branch.outputs.branch == 'main'}} if: ${{inputs.tag == 'image' && steps.extract_branch.outputs.branch == 'main'}}
run: | run: |
echo "::set-output name=digest::$(REGISTRY=ghcr.io GITHUB_TOKEN=${{secrets.registry_password}} make ${{inputs.publish_command}}-dev)" echo "::set-output name=digest::$(REGISTRY=ghcr.io REGISTRY_PASSWORD=${{secrets.registry_password}} make ${{inputs.publish_command}}-dev)"
- name: ko build release image - name: ko build release image
id: ko-build id: ko-build

65
Makefile
View file

@ -101,23 +101,23 @@ LD_FLAGS_DEV = "-s -w -X $(PACKAGE)/pkg/version.BuildVersion=$(GIT_VERSION_DE
.PHONY: fmt .PHONY: fmt
fmt: ## Run go fmt fmt: ## Run go fmt
go fmt ./... @go fmt ./...
.PHONY: vet .PHONY: vet
vet: ## Run go vet vet: ## Run go vet
go vet ./... @go vet ./...
$(KYVERNO): $(KYVERNO): fmt vet
CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) go build -o $(KYVERNO) -ldflags=$(LD_FLAGS) $(KYVERNO_DIR) @CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) go build -o $(KYVERNO) -ldflags=$(LD_FLAGS) $(KYVERNO_DIR)
$(KYVERNOPRE): fmt vet $(KYVERNOPRE): fmt vet
CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) go build -o $(KYVERNOPRE) -ldflags=$(LD_FLAGS) $(KYVERNOPRE_DIR) @CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) go build -o $(KYVERNOPRE) -ldflags=$(LD_FLAGS) $(KYVERNOPRE_DIR)
$(CLI): fmt vet $(CLI): fmt vet
CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) go build -o $(CLI) -ldflags=$(LD_FLAGS) $(CLI_DIR) @CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) go build -o $(CLI) -ldflags=$(LD_FLAGS) $(CLI_DIR)
.PHONY: build-kyverno .PHONY: build-kyverno
build-kyverno: fmt vet | $(KYVERNO) ## Build kyverno build-kyverno: $(KYVERNO) ## Build kyverno
.PHONY: build-kyvernopre .PHONY: build-kyvernopre
build-kyvernopre: $(KYVERNOPRE) ## Build kyvernopre build-kyvernopre: $(KYVERNOPRE) ## Build kyvernopre
@ -131,55 +131,54 @@ build-all: build-kyverno build-kyvernopre build-cli ## Build all
# BUILD (KO) # # BUILD (KO) #
############## ##############
INITC_KIND_IMAGE := kind.local/github.com/kyverno/kyverno/cmd/initcontainer INITC_KIND_IMAGE := ko.local/github.com/kyverno/kyverno/cmd/initcontainer
KYVERNO_KIND_IMAGE := kind.local/github.com/kyverno/kyverno/cmd/kyverno KYVERNO_KIND_IMAGE := ko.local/github.com/kyverno/kyverno/cmd/kyverno
INITC_IMAGE := kyvernopre INITC_IMAGE := kyvernopre
KO_PLATFORM := linux/amd64,linux/arm64,linux/s390x KO_PLATFORM := linux/amd64,linux/arm64,linux/s390x
REPO_KYVERNO := $(REPO)/kyverno REPO_KYVERNO := $(REPO)/kyverno
REPO_KYVERNOPRE := $(REPO)/kyvernopre REPO_KYVERNOPRE := $(REPO)/kyvernopre
REPO_CLI := $(REPO)/kyverno-cli REPO_CLI := $(REPO)/kyverno-cli
REGISTRY_USERNAME ?= dummy
.PHONY: ko-login
ko-login: $(KO)
@$(KO) login $(REGISTRY) --username $(REGISTRY_USERNAME) --password $(REGISTRY_PASSWORD)
.PHONY: ko-build-initContainer .PHONY: ko-build-initContainer
ko-build-initContainer: $(KO) ko-build-initContainer: ko-login
# @$(KO) login $(REGISTRY)
@LD_FLAGS=$(LD_FLAGS) KO_DOCKER_REPO=$(REPO_KYVERNOPRE) $(KO) build $(KYVERNOPRE_DIR) --bare --tags=latest,$(IMAGE_TAG) --platform=$(KO_PLATFORM) @LD_FLAGS=$(LD_FLAGS) KO_DOCKER_REPO=$(REPO_KYVERNOPRE) $(KO) build $(KYVERNOPRE_DIR) --bare --tags=latest,$(IMAGE_TAG) --platform=$(KO_PLATFORM)
.PHONY: ko-build-kyverno .PHONY: ko-build-kyverno
ko-build-kyverno: $(KO) ko-build-kyverno: ko-login
# @$(KO) login $(REGISTRY)
@LD_FLAGS=$(LD_FLAGS) KO_DOCKER_REPO=$(REPO_KYVERNO) $(KO) build $(KYVERNO_DIR) --bare --tags=latest,$(IMAGE_TAG) --platform=$(KO_PLATFORM) @LD_FLAGS=$(LD_FLAGS) KO_DOCKER_REPO=$(REPO_KYVERNO) $(KO) build $(KYVERNO_DIR) --bare --tags=latest,$(IMAGE_TAG) --platform=$(KO_PLATFORM)
.PHONY: ko-build-cli .PHONY: ko-build-cli
ko-build-cli: $(KO) ko-build-cli: ko-login
# @$(KO) login $(REGISTRY)
@LD_FLAGS=$(LD_FLAGS) KO_DOCKER_REPO=$(REPO_CLI) $(KO) build $(CLI_DIR) --bare --tags=latest,$(IMAGE_TAG) --platform=$(KO_PLATFORM) @LD_FLAGS=$(LD_FLAGS) KO_DOCKER_REPO=$(REPO_CLI) $(KO) build $(CLI_DIR) --bare --tags=latest,$(IMAGE_TAG) --platform=$(KO_PLATFORM)
.PHONY: ko-build-initContainer-dev .PHONY: ko-build-initContainer-dev
ko-build-initContainer-dev: $(KO) ko-build-initContainer-dev: ko-login
@$(KO) login $(REGISTRY) --username "dummy" --password $(GITHUB_TOKEN)
@LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=$(REPO_KYVERNOPRE) $(KO) build $(KYVERNOPRE_DIR) --bare --tags=latest,$(IMAGE_TAG_DEV) --platform=$(KO_PLATFORM) @LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=$(REPO_KYVERNOPRE) $(KO) build $(KYVERNOPRE_DIR) --bare --tags=latest,$(IMAGE_TAG_DEV) --platform=$(KO_PLATFORM)
.PHONY: ko-build-kyverno-dev .PHONY: ko-build-kyverno-dev
ko-build-kyverno-dev: $(KO) ko-build-kyverno-dev: ko-login
@$(KO) login $(REGISTRY) --username "dummy" --password $(GITHUB_TOKEN)
@LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=$(REPO_KYVERNO) $(KO) build $(KYVERNO_DIR) --bare --tags=latest,$(IMAGE_TAG_DEV) --platform=$(KO_PLATFORM) @LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=$(REPO_KYVERNO) $(KO) build $(KYVERNO_DIR) --bare --tags=latest,$(IMAGE_TAG_DEV) --platform=$(KO_PLATFORM)
.PHONY: ko-build-cli-dev .PHONY: ko-build-cli-dev
ko-build-cli-dev: $(KO) ko-build-cli-dev: ko-login
@$(KO) login $(REGISTRY) --username "dummy" --password $(GITHUB_TOKEN)
@LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=$(REPO_CLI) $(KO) build $(CLI_DIR) --bare --tags=latest,$(IMAGE_TAG_DEV) --platform=$(KO_PLATFORM) @LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=$(REPO_CLI) $(KO) build $(CLI_DIR) --bare --tags=latest,$(IMAGE_TAG_DEV) --platform=$(KO_PLATFORM)
.PHONY: ko-build-initContainer-local .PHONY: ko-build-initContainer-local
ko-build-initContainer-local: $(KO) ko-build-initContainer-local: $(KO)
@LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=kind.local $(KO) build $(KYVERNOPRE_DIR) --preserve-import-paths --tags=latest,$(IMAGE_TAG_DEV) --platform=linux/$(GOARCH) @LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=ko.local $(KO) build $(KYVERNOPRE_DIR) --preserve-import-paths --tags=latest,$(IMAGE_TAG_DEV) --platform=$(KO_PLATFORM)
.PHONY: ko-build-kyverno-local .PHONY: ko-build-kyverno-local
ko-build-kyverno-local: $(KO) ko-build-kyverno-local: $(KO)
@LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=kind.local $(KO) build $(KYVERNO_DIR) --preserve-import-paths --tags=latest,$(IMAGE_TAG_DEV) --platform=linux/$(GOARCH) @LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=ko.local $(KO) build $(KYVERNO_DIR) --preserve-import-paths --tags=latest,$(IMAGE_TAG_DEV) --platform=$(KO_PLATFORM)
.PHONY: ko-build-cli-local .PHONY: ko-build-cli-local
ko-build-cli-local: $(KO) ko-build-cli-local: $(KO)
@LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=kind.local $(KO) build $(CLI_DIR) --preserve-import-paths --tags=latest,$(IMAGE_TAG_DEV) --platform=linux/$(GOARCH) @LD_FLAGS=$(LD_FLAGS_DEV) KO_DOCKER_REPO=ko.local $(KO) build $(CLI_DIR) --preserve-import-paths --tags=latest,$(IMAGE_TAG_DEV) --platform=$(KO_PLATFORM)
.PHONY: ko-build-all .PHONY: ko-build-all
ko-build-all: ko-build-initContainer ko-build-kyverno ko-build-cli ko-build-all: ko-build-initContainer ko-build-kyverno ko-build-cli
@ -190,20 +189,6 @@ ko-build-all-dev: ko-build-initContainer-dev ko-build-kyverno-dev ko-build-cli-d
.PHONY: ko-build-all-local .PHONY: ko-build-all-local
ko-build-all-local: ko-build-initContainer-local ko-build-kyverno-local ko-build-cli-local ko-build-all-local: ko-build-initContainer-local ko-build-kyverno-local ko-build-cli-local
# ko-build-initContainer-amd64: KO_DOCKER_REPO=$(REPO)/$(INITC_IMAGE)
# ko-build-initContainer-amd64: $(KO)
# @$(KO) build ./$(INITC_PATH) --bare --tags=latest,$(IMAGE_TAG) --platform=linux/amd64
# ko-build-kyverno-amd64: KO_DOCKER_REPO=$(REPO)/$(KYVERNO_IMAGE)
# ko-build-kyverno-amd64: $(KO)
# @$(KO) build ./$(KYVERNO_PATH) --bare --tags=latest,$(IMAGE_TAG) --platform=linux/amd64
# ko-build-cli-amd64: KO_DOCKER_REPO=$(REPO)/$(KYVERNO_CLI_IMAGE)
# ko-build-cli-amd64: $(KO)
# @$(KO) build ./$(CLI_PATH) --bare --tags=latest,$(IMAGE_TAG) --platform=linux/amd64
# ko-build-all-amd64: ko-build-initContainer-amd64 ko-build-kyverno-amd64 ko-build-cli-amd64
################################## ##################################
# KYVERNO # KYVERNO
################################## ##################################
@ -364,13 +349,13 @@ e2e-kustomize: $(KUSTOMIZE) ## Build kustomize manifests for e2e tests
$(KUSTOMIZE) edit set image $(REPO)/$(KYVERNO_IMAGE)=$(KYVERNO_KIND_IMAGE):$(IMAGE_TAG_DEV) $(KUSTOMIZE) edit set image $(REPO)/$(KYVERNO_IMAGE)=$(KYVERNO_KIND_IMAGE):$(IMAGE_TAG_DEV)
$(KUSTOMIZE) build config/ -o config/install.yaml $(KUSTOMIZE) build config/ -o config/install.yaml
# TODO(eddycharly): this is not going to work with docker
.PHONY: e2e-init-container .PHONY: e2e-init-container
e2e-init-container: kind-e2e-cluster | ko-build-initContainer-local e2e-init-container: kind-e2e-cluster | ko-build-initContainer-local
$(KIND) load docker-image $(INITC_KIND_IMAGE):$(IMAGE_TAG_DEV)
# TODO(eddycharly): this is not going to work with docker
.PHONY: e2e-kyverno-container .PHONY: e2e-kyverno-container
e2e-kyverno-container: kind-e2e-cluster | ko-build-kyverno-local e2e-kyverno-container: kind-e2e-cluster | ko-build-kyverno-local
$(KIND) load docker-image $(KYVERNO_KIND_IMAGE):$(IMAGE_TAG_DEV)
.PHONY: create-e2e-infrastructure .PHONY: create-e2e-infrastructure
create-e2e-infrastructure: e2e-init-container e2e-kyverno-container e2e-kustomize | ## Setup infrastructure for e2e tests create-e2e-infrastructure: e2e-init-container e2e-kyverno-container e2e-kustomize | ## Setup infrastructure for e2e tests