diff --git a/config/components/tls/ca/issuers.yaml b/config/components/cert-manager/ca/issuers.yaml similarity index 100% rename from config/components/tls/ca/issuers.yaml rename to config/components/cert-manager/ca/issuers.yaml diff --git a/config/components/tls/ca/kustomization.yaml b/config/components/cert-manager/ca/kustomization.yaml similarity index 100% rename from config/components/tls/ca/kustomization.yaml rename to config/components/cert-manager/ca/kustomization.yaml diff --git a/config/components/tls/catalogd/kustomization.yaml b/config/components/cert-manager/catalogd/kustomization.yaml similarity index 100% rename from config/components/tls/catalogd/kustomization.yaml rename to config/components/cert-manager/catalogd/kustomization.yaml diff --git a/config/components/tls/catalogd/patches/catalogd_service_port.yaml b/config/components/cert-manager/catalogd/patches/catalogd_service_port.yaml similarity index 100% rename from config/components/tls/catalogd/patches/catalogd_service_port.yaml rename to config/components/cert-manager/catalogd/patches/catalogd_service_port.yaml diff --git a/config/components/tls/catalogd/patches/catalogd_webhook.yaml b/config/components/cert-manager/catalogd/patches/catalogd_webhook.yaml similarity index 100% rename from config/components/tls/catalogd/patches/catalogd_webhook.yaml rename to config/components/cert-manager/catalogd/patches/catalogd_webhook.yaml diff --git a/config/components/tls/catalogd/patches/manager_deployment_cacerts.yaml b/config/components/cert-manager/catalogd/patches/manager_deployment_cacerts.yaml similarity index 100% rename from config/components/tls/catalogd/patches/manager_deployment_cacerts.yaml rename to config/components/cert-manager/catalogd/patches/manager_deployment_cacerts.yaml diff --git a/config/components/tls/catalogd/patches/manager_deployment_certs.yaml b/config/components/cert-manager/catalogd/patches/manager_deployment_certs.yaml similarity index 100% rename from config/components/tls/catalogd/patches/manager_deployment_certs.yaml rename to config/components/cert-manager/catalogd/patches/manager_deployment_certs.yaml diff --git a/config/components/tls/catalogd/resources/certificate.yaml b/config/components/cert-manager/catalogd/resources/certificate.yaml similarity index 100% rename from config/components/tls/catalogd/resources/certificate.yaml rename to config/components/cert-manager/catalogd/resources/certificate.yaml diff --git a/config/components/cert-manager/kustomization.yaml b/config/components/cert-manager/kustomization.yaml new file mode 100644 index 000000000..2b3eed68e --- /dev/null +++ b/config/components/cert-manager/kustomization.yaml @@ -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 diff --git a/config/components/tls/operator-controller/kustomization.yaml b/config/components/cert-manager/operator-controller/kustomization.yaml similarity index 100% rename from config/components/tls/operator-controller/kustomization.yaml rename to config/components/cert-manager/operator-controller/kustomization.yaml diff --git a/config/components/tls/operator-controller/patches/manager_deployment_cert.yaml b/config/components/cert-manager/operator-controller/patches/manager_deployment_cert.yaml similarity index 100% rename from config/components/tls/operator-controller/patches/manager_deployment_cert.yaml rename to config/components/cert-manager/operator-controller/patches/manager_deployment_cert.yaml diff --git a/config/components/tls/operator-controller/resources/manager_cert.yaml b/config/components/cert-manager/operator-controller/resources/manager_cert.yaml similarity index 100% rename from config/components/tls/operator-controller/resources/manager_cert.yaml rename to config/components/cert-manager/operator-controller/resources/manager_cert.yaml diff --git a/config/overlays/standard-e2e/kustomization.yaml b/config/overlays/standard-e2e/kustomization.yaml index 2bc540350..8b4a152f7 100644 --- a/config/overlays/standard-e2e/kustomization.yaml +++ b/config/overlays/standard-e2e/kustomization.yaml @@ -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 diff --git a/config/overlays/standard/kustomization.yaml b/config/overlays/standard/kustomization.yaml index ea113bb9d..8becbcac4 100644 --- a/config/overlays/standard/kustomization.yaml +++ b/config/overlays/standard/kustomization.yaml @@ -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 diff --git a/config/overlays/tilt-local-dev/catalogd/kustomization.yaml b/config/overlays/tilt-local-dev/catalogd/kustomization.yaml index 846656bb4..27e6d799c 100644 --- a/config/overlays/tilt-local-dev/catalogd/kustomization.yaml +++ b/config/overlays/tilt-local-dev/catalogd/kustomization.yaml @@ -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: diff --git a/config/overlays/tilt-local-dev/operator-controller/kustomization.yaml b/config/overlays/tilt-local-dev/operator-controller/kustomization.yaml index 403f2d102..80c0eba62 100644 --- a/config/overlays/tilt-local-dev/operator-controller/kustomization.yaml +++ b/config/overlays/tilt-local-dev/operator-controller/kustomization.yaml @@ -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: