Skip to content

Commit 19709d6

Browse files
Merge pull request #427 from MateSaary/OSD-29208-remove-template-generation
OSD-29208 - Remove CAD template file generation
2 parents 828c3ae + ec37685 commit 19709d6

27 files changed

+5
-969
lines changed

Makefile

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ help: # Display this help
1919

2020
##@ Global:
2121
.PHONY: all
22-
all: interceptor cadctl template-updater generate-template-file ## Generate, build, lint, test all subprojects
22+
all: interceptor cadctl ## Generate, build, lint, test all subprojects
2323

2424
.PHONY: build
25-
build: build-interceptor build-cadctl build-template-updater ## Build all subprojects in this repository
25+
build: build-interceptor build-cadctl ## Build all subprojects in this repository
2626

2727
.PHONY: lint
28-
lint: lint-cadctl lint-interceptor lint-template-updater ## Lint all subprojects
28+
lint: lint-cadctl lint-interceptor ## Lint all subprojects
2929

3030
.PHONY: test
3131
test: test-cadctl test-interceptor
3232

3333
##@ cadctl:
3434
.PHONY: cadctl
35-
cadctl: generate-cadctl build-cadctl test-cadctl lint-cadctl generate-template-file ## Run all targets for cadctl (generate, build, test, lint, generation)
35+
cadctl: generate-cadctl build-cadctl test-cadctl lint-cadctl ## Run all targets for cadctl (generate, build, test, lint, generation)
3636

3737
.PHONY: generate-cadctl
3838
generate-cadctl: check-go121-install install-mockgen ## Generate mocks for cadctl
@@ -91,40 +91,18 @@ test-interceptor-e2e: check-go121-install check-jq-install check-vault-install b
9191
bootstrap-investigation: ## Bootstrap a new boilerplate investigation
9292
@cd hack && ./bootstrap-investigation.sh
9393

94-
##@ Template-updater:
95-
.PHONY: template-updater
96-
template-updater: build-template-updater lint-template-updater ## Run all targets for template-updater
97-
98-
.PHONY: build-template-updater
99-
build-template-updater: ## Build the template-updater binary
100-
@echo
101-
@echo "Building template-updater..."
102-
cd hack/update-template && go build -ldflags="-s -w" -mod=readonly -trimpath -o ../../bin/template-updater .
103-
104-
.PHONY: lint-template-updater
105-
lint-template-updater: install-linter ## Lint template-updater subproject
106-
@echo
107-
@echo "Linting template-updater..."
108-
# Explicitly set GOROOT, see https://github.com/golangci/golangci-lint/issues/3107
109-
cd hack/update-template && GOROOT=/usr/lib/golang GOLANGCI_LINT_CACHE=$$(mktemp -d) $(GOPATH)/bin/golangci-lint run -c ../../.golangci.yml
11094

11195
.PHONY: boilerplate-update
11296
boilerplate-update: ## Update boilerplate version
11397
@boilerplate/update
11498

115-
.PHONY: generate-template-file
116-
generate-template-file: build-template-updater ## Generate deploy template file
117-
@echo
118-
@echo "Generating template file..."
119-
cp ./bin/template-updater ./hack/update-template/ && cd ./hack/update-template/ && ./template-updater
120-
12199
### CI Only
122100
.PHONY: coverage
123101
coverage:
124102
hack/codecov.sh
125103

126104
.PHONY: validate
127-
validate: generate-template-file isclean
105+
validate: isclean
128106

129107
### Prerequisites
130108
### It is assumed that 'make' is already installed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ Investigation specific documentation can be found in the according investigation
134134

135135
### Templates
136136

137-
* [Update-Template](./hack/update-template/README.md) -- Updating configuration-anomaly-detection-template.Template.yaml.
138137
* [OpenShift](./openshift/README.md) -- Used by app-interface to deploy the CAD resources on a target cluster.
139138

140139
### Dashboards

deploy/README.md

Lines changed: 0 additions & 116 deletions
This file was deleted.

deploy/interceptor.yaml

Lines changed: 0 additions & 91 deletions
This file was deleted.

deploy/namespace/README.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

deploy/namespace/namespace.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

deploy/pipeline-trigger.yaml

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)