✨ Update to catalogd v0.17.0 to share a common certificate issuer (#970)

* Reorganize config to support reusable components

Update to catalogd v0.17.0 to share a common certificate issuer

Signed-off-by: Todd Short <[email protected]>

* fixup! Reorganize config to support reusable components

Signed-off-by: Todd Short <[email protected]>

---------

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

Makefile

@@ -54,7 +54,7 @@ else
 $(warning Could not find docker or podman in path! This may result in targets requiring a container runtime failing!)
 endif
 
-KUSTOMIZE_BUILD_DIR := config/overlays/tls
+KUSTOMIZE_BUILD_DIR := config/overlays/cert-manager
 
 # Disable -j flag for make
 .NOTPARALLEL:
@@ -155,6 +155,7 @@ test-e2e: GO_BUILD_FLAGS := -cover
 test-e2e: run image-registry build-push-e2e-catalog registry-load-bundles e2e e2e-coverage kind-clean #HELP Run e2e test suite on local kind cluster
 
 .PHONY: extension-developer-e2e
+extension-developer-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/cert-manager
 extension-developer-e2e: KIND_CLUSTER_NAME := operator-controller-ext-dev-e2e  #EXHELP Run extension-developer e2e on local kind cluster
 extension-developer-e2e: run image-registry test-ext-dev-e2e kind-clean
 

Tiltfile

@@ -1,23 +1,21 @@
 if not os.path.exists('../tilt-support'):
     fail('Please clone https://github.com/operator-framework/tilt-support to ../tilt-support')
 
-load('../tilt-support/Tiltfile', 'deploy_repo', 'process_yaml')
+load('../tilt-support/Tiltfile', 'deploy_repo')
 
 config.define_string_list('repos', args=True)
 cfg = config.parse()
 repos = cfg.get('repos', ['operator-controller', 'catalogd'])
 
 repo = {
     'image': 'quay.io/operator-framework/operator-controller',
-    'yaml': 'config/overlays/tls',
+    'yaml': 'config/overlays/cert-manager',
     'binaries': {
         'manager': 'operator-controller-controller-manager',
     },
     'starting_debug_port': 30000,
 }
 
-process_yaml("testdata/certs/issuers.yaml")
-
 for r in repos:
     if r == 'operator-controller':
         deploy_repo('operator-controller', repo)

config/README.md

@@ -0,0 +1,52 @@
+# OPERATOR-CONTROLLER CONFIG
+
+## config/base
+
+This provides an insecure (i.e. no TLS) basic configuration of operator-controller.
+
+This configuration specifies a namespace of `olmv1-system`.
+
+## config/overlays/cert-manager
+
+This includes support for a secure (i.e. with TLS) configuration of operator-controller. This configuration uses:
+* config/base
+* config/components/tls
+* config/components/ca
+
+This configuration requires cert-manager.
+
+## config/overlays/e2e
+
+This provides additional configuration support for end-to-end testing, including code coverage. This configuration uses:
+* config/base
+* config/components/tls
+* config/components/ca
+* config/components/coverage
+
+This configuration requires cert-manager.
+
+## Components
+
+Each of the `kustomization.yaml` files specify a `Component`, rather than an overlay.
+
+### config/components/tls
+
+This provides a basic configuration of operator-controller with TLS support for catalogd.
+
+This component specifies the `olmv1-system` namespace.
+
+This component requires cert-manager.
+
+### config/components/coverage
+
+Provides configuration for code coverage.
+
+This component specifies the `olmv1-system` namespace.
+
+### config/components/ca
+
+Procides a CA for operator-controller operation.
+
+This component _does not_ specify a namespace, and must be included last.
+
+This component requires cert-manager.

testdata/certs/issuers.yaml renamed to config/components/ca/issuers.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+# No namespace is specified here, otherwise, it will overwrite _all_ the other namespaces!
+resources:
+- issuers.yaml

config/components/ca/kustomization.yaml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+namespace: olmv1-system
+resources:
+- manager_e2e_coverage_pvc.yaml
+- manager_e2e_coverage_copy_pod.yaml
+patches:
+- path: manager_e2e_coverage_patch.yaml

config/components/coverage/kustomization.yaml

@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+namespace: olmv1-system
+resources:
+- resources/manager_cert.yaml
+patches:
+- target:
+    kind: Deployment
+    name: controller-manager
+  path: patches/manager_deployment_cert.yaml