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.

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

Miles/kustomize sanity #1

Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
* Restructure kustomizations.
Miles-Garnsey committed Sep 22, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 7b4a1384eee63fdc22389312c436d0a72bdd5802
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -137,15 +137,15 @@ endif
kind-e2e-test: build kustomize docker-build create-kind-multicluster kind-load-image-multi e2e-test

single-up: build kustomize docker-build create-kind-cluster kind-load-image cert-manager
$(KUSTOMIZE) build scripts/control_plane | kubectl apply -f -
$(KUSTOMIZE) build aux-config/control_plane | kubectl apply -f -

multi-up: build kustomize docker-build create-kind-multicluster kind-load-image-multi cert-manager-multi
## install the control plane
kubectl config use-context kind-k8ssandra-0
$(KUSTOMIZE) build scripts/control_plane | kubectl apply -f -
$(KUSTOMIZE) build aux-config/control_plane | kubectl apply -f -
## install the data plane
kubectl config use-context kind-k8ssandra-1
$(KUSTOMIZE) build scripts/data_plane | kubectl apply -f -
$(KUSTOMIZE) build aux-config/data_plane | kubectl apply -f -
## Create a client config
make create-client-config
## Restart the control plane
2 changes: 2 additions & 0 deletions aux-config/control_plane/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
resources:
- ../default
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resources:
- github.com/k8ssandra/k8ssandra-operator/config/default?ref=main
- ../default

patchesJson6902:
- patch: |-
@@ -10,8 +10,4 @@ patchesJson6902:
group: apps
kind: Deployment
name: k8ssandra-operator
version: v1

images:
- name: k8ssandra/k8ssandra-operator
newTag: latest
version: v1
4 changes: 4 additions & 0 deletions aux-config/default/cass-operator/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
namespace: default
resources:
- github.com/k8ssandra/cass-operator/config/default?ref=v1.8.0-rc.1
# namePrefix: cass-operator- # Can be removed in this case because cass-operator already has a namePrefix defined in the repo.
3 changes: 3 additions & 0 deletions aux-config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
resources:
- ./cass-operator
- ../../config/default
2 changes: 0 additions & 2 deletions config/cass-operator-crd/kustomization.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions config/cass-operator/kustomization.yaml

This file was deleted.

1 change: 0 additions & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@ namespace: default
# -

resources:
- ../cass-operator
- ../crd
- ../rbac
- ../manager
6 changes: 0 additions & 6 deletions scripts/control_plane/kustomization.yaml

This file was deleted.