Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
8 changes: 8 additions & 0 deletions config/components/cert-manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
# No namespace is specified here, otherwise, it will overwrite _all_ the other namespaces!
components:
- catalogd
- operator-controller
# ca must be last, other components will overwrite the namespace
- ca
6 changes: 2 additions & 4 deletions config/overlays/standard-e2e/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ resources:
- ../../base/operator-controller
- ../../base/common
components:
- ../../components/tls/catalogd
- ../../components/tls/operator-controller
- ../../components/e2e
# ca must be last or other components will overwrite the namespaces
- ../../components/tls/ca
# This must be last due to namespace overwrite issues of the ca
- ../../components/cert-manager
Copy link
Contributor

Choose a reason for hiding this comment

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

That make sense if we want add the OCP CA in upstream as well.
I understood that we were looking for that so we could have another componet for it too

/lgtm

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, that's the idea, if we ever want to swap certificate providers, this will make it easier.
I may try to update this to avoid this weird namespace mechanism... @joelanford had something in older refactoring PR.

6 changes: 2 additions & 4 deletions config/overlays/standard/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ resources:
- ../../base/operator-controller
- ../../base/common
components:
- ../../components/tls/catalogd
- ../../components/tls/operator-controller
# ca must be last other components will overwrite the namespaces
- ../../components/tls/ca
# This must be last due to namespace overwrite issues of the ca
- ../../components/cert-manager
4 changes: 2 additions & 2 deletions config/overlays/tilt-local-dev/catalogd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ resources:
- ../../../base/catalogd
- ../../../base/common
components:
- ../../../components/tls/catalogd
- ../../../components/cert-manager/catalogd
# ca must be last or other components will overwrite the namespaces
- ../../../components/tls/ca
- ../../../components/cert-manager/ca

patches:
- target:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ resources:
- ../../../base/operator-controller
- ../../../base/common
components:
- ../../../components/tls/operator-controller
- ../../../components/cert-manager/operator-controller
# ca must be last or other components will overwrite the namespaces
- ../../../components/tls/ca
- ../../../components/cert-manager/ca

patches:
- target:
Expand Down
Loading