Skip to content

Commit 9d3fd66

Browse files
authored
Remove module-template (#305)
1 parent 7366ba4 commit 9d3fd66

5 files changed

+0
-100
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ bin/*
3838
# Vendor
3939
vendor/
4040

41-
module-template.yaml
4241
nats-manager.yaml
4342
module-config.yaml
4443

Makefile

-19
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ OS_TYPE ?= $(shell uname)
1414
# Module Registry used for pushing the image
1515
MODULE_REGISTRY_PORT ?= 8888
1616
MODULE_REGISTRY ?= op-kcp-registry.localhost:$(MODULE_REGISTRY_PORT)/unsigned
17-
# Desired Channel of the Generated Module Template
18-
MODULE_CHANNEL ?= fast
1917

2018
# Image URL to use all building/pushing image targets
2119
IMG_REGISTRY_PORT ?= $(MODULE_REGISTRY_PORT)
@@ -190,23 +188,6 @@ module-image: docker-build docker-push ## Build the Module Image and push it to
190188
echo "built and pushed module image $(IMG)"
191189

192190
DEFAULT_CR ?= $(shell pwd)/config/samples/default.yaml
193-
.PHONY: module-build
194-
module-build: kyma render-manifest module-config-template configure-git-origin ## Build the Module and push it to a registry defined in MODULE_REGISTRY
195-
#################################################################
196-
## Building module with:
197-
# - image: ${IMG}
198-
# - channel: ${MODULE_CHANNEL}
199-
# - name: kyma-project.io/module/$(MODULE_NAME)
200-
# - version: $(MODULE_VERSION)
201-
@$(KYMA) alpha create module --path . --output=module-template.yaml --module-config-file=module-config.yaml $(MODULE_CREATION_FLAGS)
202-
203-
.PHONY: module-config-template
204-
module-config-template:
205-
@cat module-config-template.yaml \
206-
| sed -e 's/{{.Channel}}/${MODULE_CHANNEL}/g' \
207-
-e 's/{{.Version}}/$(MODULE_VERSION)/g' \
208-
-e 's/{{.Name}}/kyma-project.io\/module\/$(MODULE_NAME)/g' \
209-
> module-config.yaml
210191

211192
.PHONY: configure-git-origin
212193
configure-git-origin:

hack/ci/Makefile

-12
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@ ifndef MODULE_SHA
1111
MODULE_SHA = ${shell git rev-parse --short HEAD}
1212
endif
1313

14-
.PHONY: module-build
15-
module-build: ## Build the Module, push it to a registry and print it based on the commit hash.
16-
@make -C ${PROJECT_ROOT} module-build \
17-
IMG=${IMG} \
18-
MODULE_REGISTRY=${MODULE_REGISTRY} \
19-
MODULE_VERSION=${MODULE_VERSION}-${MODULE_SHA}
20-
cp -f ${PROJECT_ROOT}/module-template.yaml ${ARTIFACTS}/module-template.yaml
21-
@echo "Added template to job artifacts: ${ARTIFACTS}/module-template.yaml"
22-
@echo "\n~~~~~~~~~~~~BEGINNING OF MODULE TEMPLATE~~~~~~~~~~~~~~"
23-
@cat ${ARTIFACTS}/module-template.yaml
24-
@echo "\n~~~~~~~~~~~~~~~END OF MODULE TEMPLATE~~~~~~~~~~~~~~~~"
25-
2614
.PHONY: create-kyma-system-ns
2715
create-kyma-system-ns: ## Create kyma-system namespace.
2816
kubectl create ns kyma-system

hack/get_module_template_from_build_job.sh

-59
This file was deleted.

module-config-template.yaml

-9
This file was deleted.

0 commit comments

Comments
 (0)