Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove module-template #452

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Remove module-template #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ bin/*
# Vendor
vendor/

module-template.yaml
eventing-manager.yaml
module-config.yaml

Expand Down
19 changes: 0 additions & 19 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
friedrichwilken marked this conversation as resolved.
Show resolved Hide resolved
# 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)
Expand Down Expand Up @@ -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:
Expand Down
9 changes: 0 additions & 9 deletions module-config-template.yaml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions scripts/render_and_upload_manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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"
Loading