From 938677a380f45a08daa778407407aeb6e129544f Mon Sep 17 00:00:00 2001 From: pjuarezd Date: Tue, 16 Jul 2024 10:33:10 -0600 Subject: [PATCH 1/2] Fix certmanager test to use the `:noop` tagged image Signed-off-by: pjuarezd --- testing/certmanager/operator/deployment.yaml | 22 +++++++++++++++++++ .../certmanager/operator/kustomization.yaml | 8 +++++++ testing/common.sh | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 testing/certmanager/operator/deployment.yaml create mode 100644 testing/certmanager/operator/kustomization.yaml diff --git a/testing/certmanager/operator/deployment.yaml b/testing/certmanager/operator/deployment.yaml new file mode 100644 index 00000000000..4be35f774ef --- /dev/null +++ b/testing/certmanager/operator/deployment.yaml @@ -0,0 +1,22 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: minio-operator + namespace: minio-operator +spec: + replicas: 2 + selector: + matchLabels: + name: minio-operator + template: + metadata: + labels: + name: minio-operator + spec: + serviceAccountName: minio-operator + containers: + - name: minio-operator + image: minio/operator:noop + env: + - name: OPERATOR_SIDECAR_IMAGE + value: minio/operator-sidecar:noop diff --git a/testing/certmanager/operator/kustomization.yaml b/testing/certmanager/operator/kustomization.yaml new file mode 100644 index 00000000000..b0ad81c63b5 --- /dev/null +++ b/testing/certmanager/operator/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../../examples/kustomization/operator-certmanager + +patches: + - path: deployment.yaml diff --git a/testing/common.sh b/testing/common.sh index cfce17abcfa..ceae9f9d752 100644 --- a/testing/common.sh +++ b/testing/common.sh @@ -577,7 +577,7 @@ function install_operator() { value=minio-operator elif [ "$1" = "certmanager" ]; then echo "Installing Current Operator with certmanager" - try kubectl apply -k "${SCRIPT_DIR}/../examples/kustomization/operator-certmanager" + try kubectl apply -k "${SCRIPT_DIR}/../testing/certmanager/operator" echo "key, value for pod selector in kustomize test" key=name value=minio-operator From 0e7e7ba6d99819a2e17bf1904d5fb0c3a93d23c6 Mon Sep 17 00:00:00 2001 From: pjuarezd Date: Tue, 16 Jul 2024 10:54:02 -0600 Subject: [PATCH 2/2] Fix: Certificate should be Issued by the CA tenant-certmanager-ca-tls, not selfSigned Signed-off-by: pjuarezd --- .../tenant-certmanager/tenant-certmanager-issuer.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/kustomization/tenant-certmanager/tenant-certmanager-issuer.yaml b/examples/kustomization/tenant-certmanager/tenant-certmanager-issuer.yaml index facee06a396..803f943bf03 100644 --- a/examples/kustomization/tenant-certmanager/tenant-certmanager-issuer.yaml +++ b/examples/kustomization/tenant-certmanager/tenant-certmanager-issuer.yaml @@ -4,4 +4,5 @@ metadata: name: tenant-certmanager-issuer namespace: tenant-certmanager spec: - selfSigned: { } + ca: + secretName: tenant-certmanager-ca-tls \ No newline at end of file