From 049fd04fa694d4d58d40a6221d2dcc8f5c22760e Mon Sep 17 00:00:00 2001 From: Marco Bebway Date: Tue, 30 Jan 2024 13:30:13 +0100 Subject: [PATCH] Remove module-template (#452) --- .gitignore | 1 - Makefile | 19 ------------------- module-config-template.yaml | 9 --------- scripts/render_and_upload_manifests.sh | 7 ------- 4 files changed, 36 deletions(-) delete mode 100644 module-config-template.yaml diff --git a/.gitignore b/.gitignore index 1c9ca1dc..7a56d62e 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,6 @@ bin/* # Vendor vendor/ -module-template.yaml eventing-manager.yaml module-config.yaml diff --git a/Makefile b/Makefile index d112b48c..4475a9a6 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,6 @@ OS_TYPE ?= $(shell uname) # Module Registry used for pushing the image MODULE_REGISTRY_PORT ?= 8888 MODULE_REGISTRY ?= op-kcp-registry.localhost:$(MODULE_REGISTRY_PORT)/unsigned -# Desired Channel of the Generated Module Template -MODULE_CHANNEL ?= fast # Image URL to use all building/pushing image targets IMG_REGISTRY_PORT ?= $(MODULE_REGISTRY_PORT) @@ -190,23 +188,6 @@ module-image: docker-build docker-push ## Build the Module Image and push it to echo "built and pushed module image $(IMG)" DEFAULT_CR ?= $(shell pwd)/config/samples/default.yaml -.PHONY: module-build -module-build: kyma render-manifest module-config-template configure-git-origin ## Build the Module and push it to a registry defined in MODULE_REGISTRY - ################################################################# - ## Building module with: - # - image: ${IMG} - # - channel: ${MODULE_CHANNEL} - # - name: kyma-project.io/module/$(MODULE_NAME) - # - version: $(MODULE_VERSION) - @$(KYMA) alpha create module --path . --output=module-template.yaml --module-config-file=module-config.yaml $(MODULE_CREATION_FLAGS) - -.PHONY: module-config-template -module-config-template: - @cat module-config-template.yaml \ - | sed -e 's/{{.Channel}}/${MODULE_CHANNEL}/g' \ - -e 's/{{.Version}}/$(MODULE_VERSION)/g' \ - -e 's/{{.Name}}/kyma-project.io\/module\/$(MODULE_NAME)/g' \ - > module-config.yaml .PHONY: configure-git-origin configure-git-origin: diff --git a/module-config-template.yaml b/module-config-template.yaml deleted file mode 100644 index 720ec8bc..00000000 --- a/module-config-template.yaml +++ /dev/null @@ -1,9 +0,0 @@ -name: {{.Name}} -channel: {{.Channel}} -version: {{.Version}} -defaultCR: config/samples/default.yaml -manifest: eventing-manager.yaml -security: sec-scanners-config.yaml -annotations: - "operator.kyma-project.io/doc-url": "https://kyma-project.io/#/eventing-manager/user/README" -moduleRepo: https://github.com/kyma-project/eventing-manager.git \ No newline at end of file diff --git a/scripts/render_and_upload_manifests.sh b/scripts/render_and_upload_manifests.sh index 95196d0c..c9e8e604 100755 --- a/scripts/render_and_upload_manifests.sh +++ b/scripts/render_and_upload_manifests.sh @@ -37,11 +37,6 @@ MODULE_VERSION=${PULL_BASE_REF} make render-manifest echo "Generated eventing-manager.yaml:" cat eventing-manager.yaml -# MODULE_VERSION=${PULL_BASE_REF} make module-build -# TODO completly remove the rendering of the module-template from the repository. -# echo "Generated moduletemplate.yaml:" -# cat module-template.yaml - echo "Updating github release with eventing-manager.yaml" echo "Finding release id for: ${PULL_BASE_REF}" @@ -66,6 +61,4 @@ fi UPLOAD_URL="https://uploads.github.com/repos/kyma-project/eventing-manager/releases/${RELEASE_ID}/assets" uploadFile "eventing-manager.yaml" "${UPLOAD_URL}?name=eventing-manager.yaml" -# TODO completly remove the rendering of the module-template from the repository. -# uploadFile "module-template.yaml" "${UPLOAD_URL}?name=module-template.yaml" uploadFile "config/samples/default.yaml" "${UPLOAD_URL}?name=eventing-default-cr.yaml"