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

Jump to bottom

🐛 Fix CABPK, addons and CAPD manifest generation #5696

Merged
merged 1 commit into from
Nov 18, 2021
Merged

🐛 Fix CABPK, addons and CAPD manifest generation #5696

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
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,7 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE)
paths=./$(EXP_DIR)/api/... \
paths=./$(EXP_DIR)/controllers/... \
paths=./$(EXP_DIR)/addons/api/... \
paths=./$(EXP_DIR)/addons/controllers/... \
paths=./$(EXP_DIR)/addons/internal/... \
paths=./$(EXP_DIR)/addons/internal/controllers/... \
crd:crdVersions=v1 \
rbac:roleName=manager-role \
output:crd:dir=./config/crd/bases \
Expand All @@ -386,7 +385,7 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE)
generate-manifests-cabpk: $(CONTROLLER_GEN)
$(CONTROLLER_GEN) \
paths=./bootstrap/kubeadm/api/... \
paths=./bootstrap/kubeadm/controllers/... \
paths=./bootstrap/kubeadm/internal/controllers/... \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of the path change the CABPK role.yaml wasn't generated anymore. The diff in the role.yaml below is caused by the switch to newer Go / CR / CT versions.

crd:crdVersions=v1 \
rbac:roleName=manager-role \
output:crd:dir=./bootstrap/kubeadm/config/crd/bases \
Expand Down
1 change: 0 additions & 1 deletion bootstrap/kubeadm/config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand Down
3 changes: 1 addition & 2 deletions test/infrastructure/docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
paths=./api/... \
paths=./$(EXP_DIR)/api/... \
paths=./$(EXP_DIR)/controllers/... \
paths=./controllers/... \
paths=./internal/... \
paths=./internal/controllers/... \
crd:crdVersions=v1 \
rbac:roleName=manager-role \
output:crd:dir=./config/crd/bases \
Expand Down