Skip to content

Commit f6abc83

Browse files
egeguneshors
andauthored
CLOUD-835: Add action to check if manifests are up-to-date (#641)
* CLOUD-835: Add action to check if manifests are up-to-date * fix manifest generation * fix crd generation --------- Co-authored-by: Viacheslav Sarzhan <[email protected]>
1 parent ae0e0f9 commit f6abc83

File tree

4 files changed

+57440
-35
lines changed

4 files changed

+57440
-35
lines changed

.github/pull_request_template.md

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
**Config/Logging/Testability**
2424
- [ ] Are all needed new/changed options added to default YAML files?
25-
- [ ] Are the manifests (crd/bundle) regenerated if needed?
2625
- [ ] Did we add proper logging messages for operator actions?
2726
- [ ] Did we ensure compatibility with the previous version or cluster upgrade process?
2827
- [ ] Does the change support oldest and newest supported PG version?

.github/workflows/reviewdog.yml

+9
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,12 @@ jobs:
7373
github_token: ${{ secrets.github_token }}
7474
reporter: github-pr-check
7575
level: info
76+
77+
manifests:
78+
name: runner / manifests
79+
runs-on: ubuntu-latest
80+
steps:
81+
- uses: actions/checkout@v4
82+
- run: |
83+
make generate VERSION=main
84+
git diff --exit-code

Makefile

+38-34
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,14 @@ check-generate: generate-rbac
266266
git diff --exit-code -- pkg/apis
267267

268268
.PHONY: generate
269-
generate: ## Generate crd, deepcopy functions, and rbac
269+
generate: ## Generate crd, crd-docs, deepcopy functions, and rbac
270+
generate: kustomize
270271
generate: generate-crd
271272
generate: generate-deepcopy
272273
generate: generate-rbac
274+
generate: generate-manager
275+
generate: generate-bundle
276+
generate: generate-cw
273277

274278
.PHONY: generate-crunchy-crd
275279
generate-crunchy-crd: ## Generate crd
@@ -310,6 +314,39 @@ generate-rbac: ## Generate rbac
310314
'./...' 'config/rbac/'
311315
$(KUSTOMIZE) build ./config/rbac/namespace/ > ./deploy/rbac.yaml
312316

317+
generate-crd: generate-crunchy-crd generate-percona-crd
318+
$(KUSTOMIZE) build ./config/crd/ > ./deploy/crd.yaml
319+
320+
generate-percona-crd:
321+
GOBIN='$(CURDIR)/hack/tools' ./hack/controller-generator.sh \
322+
crd:crdVersions='v1' \
323+
paths='./pkg/apis/pgv2.percona.com/...' \
324+
output:dir='build/crd/percona/generated' # build/crd/generated/{group}_{plural}.yaml
325+
$(KUSTOMIZE) build ./build/crd/percona/ > ./config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
326+
327+
generate-manager:
328+
cd ./config/manager/namespace/ && $(KUSTOMIZE) edit set image postgres-operator=$(IMAGE)
329+
$(KUSTOMIZE) build ./config/manager/namespace/ > ./deploy/operator.yaml
330+
331+
generate-bundle:
332+
cd ./config/bundle/ && $(KUSTOMIZE) edit set image postgres-operator=$(IMAGE)
333+
$(KUSTOMIZE) build ./config/bundle/ > ./deploy/bundle.yaml
334+
335+
generate-cw: generate-cw-rbac generate-cw-manager generate-cw-bundle
336+
337+
generate-cw-rbac:
338+
$(KUSTOMIZE) build ./config/rbac/cluster/ > ./deploy/cw-rbac.yaml
339+
340+
generate-cw-manager:
341+
cd ./config/manager/cluster && $(KUSTOMIZE) edit set image postgres-operator=$(IMAGE)
342+
$(KUSTOMIZE) build ./config/manager/cluster/ > ./deploy/cw-operator.yaml
343+
344+
generate-cw-bundle:
345+
cd ./config/cw-bundle/ && $(KUSTOMIZE) edit set image postgres-operator=$(IMAGE)
346+
$(KUSTOMIZE) build ./config/cw-bundle/ > ./deploy/cw-bundle.yaml
347+
348+
349+
313350
##@ Release
314351

315352
.PHONY: license licenses
@@ -359,39 +396,6 @@ build-docker-image:
359396
build-extension-installer-image:
360397
ROOT_REPO=$(ROOT_REPO) VERSION=$(VERSION) IMAGE=$(IMAGE)-ext-installer COMPONENT=extension-installer $(ROOT_REPO)/e2e-tests/build
361398

362-
generate: kustomize generate-crd generate-deepcopy generate-rbac generate-manager generate-bundle generate-cw
363-
364-
generate-crd: generate-crunchy-crd generate-percona-crd
365-
$(KUSTOMIZE) build ./config/crd/ > ./deploy/crd.yaml
366-
367-
generate-percona-crd:
368-
GOBIN='$(CURDIR)/hack/tools' ./hack/controller-generator.sh \
369-
crd:crdVersions='v1' \
370-
paths='./pkg/apis/pgv2.percona.com/...' \
371-
output:dir='build/crd/percona/generated' # build/crd/generated/{group}_{plural}.yaml
372-
$(KUSTOMIZE) build ./build/crd/percona/ > ./config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
373-
374-
generate-manager:
375-
cd ./config/manager/namespace/ && $(KUSTOMIZE) edit set image postgres-operator=$(IMAGE)
376-
$(KUSTOMIZE) build ./config/manager/namespace/ > ./deploy/operator.yaml
377-
378-
generate-bundle:
379-
cd ./config/bundle/ && $(KUSTOMIZE) edit set image postgres-operator=$(IMAGE)
380-
$(KUSTOMIZE) build ./config/bundle/ > ./deploy/bundle.yaml
381-
382-
generate-cw: generate-cw-rbac generate-cw-manager generate-cw-bundle
383-
384-
generate-cw-rbac:
385-
$(KUSTOMIZE) build ./config/rbac/cluster/ > ./deploy/cw-rbac.yaml
386-
387-
generate-cw-manager:
388-
cd ./config/manager/cluster && $(KUSTOMIZE) edit set image postgres-operator=$(IMAGE)
389-
$(KUSTOMIZE) build ./config/manager/cluster/ > ./deploy/cw-operator.yaml
390-
391-
generate-cw-bundle:
392-
cd ./config/cw-bundle/ && $(KUSTOMIZE) edit set image postgres-operator=$(IMAGE)
393-
$(KUSTOMIZE) build ./config/cw-bundle/ > ./deploy/cw-bundle.yaml
394-
395399
SWAGGER = $(shell pwd)/bin/swagger
396400
swagger: ## Download swagger locally if necessary.
397401
$(call go-get-tool,$(SWAGGER),github.com/go-swagger/go-swagger/cmd/swagger@latest)

0 commit comments

Comments
 (0)