From c288c843e152aa389d1a772f2e237fe736651dc3 Mon Sep 17 00:00:00 2001 From: Korbinian Stoemmer Date: Thu, 14 Sep 2023 13:53:04 +0200 Subject: [PATCH] fix release scripts (#139) * bump image * bump version * fix scripts * revert change to resources --- .version | 2 +- Makefile | 5 +++++ config/manager/kustomization.yaml | 6 ++++++ scripts/release.sh | 5 +++-- sec-scanners-config.yaml | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.version b/.version index e4bb8821..a4b99c5d 100644 --- a/.version +++ b/.version @@ -1,2 +1,2 @@ # next version to be released -MODULE_VERSION=0.1.1 +MODULE_VERSION=0.1.2 diff --git a/Makefile b/Makefile index 4003418f..afadf4fc 100644 --- a/Makefile +++ b/Makefile @@ -166,6 +166,11 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} $(KUSTOMIZE) build config/default | kubectl apply -f - +.PHONY: render-manifest +render-manifest: manifests kustomize + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} + $(KUSTOMIZE) build config/default > nats-manager.yaml + .PHONY: undeploy undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion. $(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(ignore-not-found) -f - diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index bae98c97..602a048a 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -11,3 +11,9 @@ resources: - manager.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +images: +- name: controller + newName: op-skr-registry.localhost:8888/unsigned/manager-images/nats-manager + newTag: 0.1.1 diff --git a/scripts/release.sh b/scripts/release.sh index 27c75f28..93ce4c7f 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -37,9 +37,10 @@ echo "Generated nats-manager.yaml:" cat nats-manager.yaml MODULE_VERSION=${PULL_BASE_REF} make module-build +mv template.yaml module-template.yaml echo "Generated moduletemplate.yaml:" -cat moduletemplate.yaml +cat module-template.yaml echo "Updating github release with nats-manager.yaml" @@ -65,5 +66,5 @@ fi UPLOAD_URL="https://uploads.github.com/repos/kyma-project/nats-manager/releases/${RELEASE_ID}/assets" uploadFile "nats-manager.yaml" "${UPLOAD_URL}?name=nats-manager.yaml" -uploadFile "moduletemplate.yaml" "${UPLOAD_URL}?name=moduletemplate.yaml" +uploadFile "module-template.yaml" "${UPLOAD_URL}?name=module-template.yaml" uploadFile "config/samples/nats_default_cr.yaml" "${UPLOAD_URL}?name=nats_default_cr.yaml" diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index c1117189..bf385e4c 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -1,6 +1,6 @@ module-name: nats-manager protecode: - - europe-docker.pkg.dev/kyma-project/prod/nats-manager:v20230913-9746cb0c + - europe-docker.pkg.dev/kyma-project/prod/nats-manager:v20230914-8292cd02 - europe-docker.pkg.dev/kyma-project/prod/external/natsio/prometheus-nats-exporter:0.12.0 - europe-docker.pkg.dev/kyma-project/prod/external/natsio/nats-server-config-reloader:0.12.0 - europe-docker.pkg.dev/kyma-project/prod/external/nats:v20230620-2.9.18-alpine3.18