Merge pull request #265 from codekow/update-cert

update: cert-manager
redhat-cop · Dec 12, 2023 · 649a5ca · 649a5ca
2 parents 4214448 + e65815e
commit 649a5ca
Show file tree

Hide file tree

Showing 32 changed files with 109 additions and 35 deletions.
diff --git a/cert-manager-operator b/cert-manager-operator
@@ -0,0 +1 @@
+openshift-cert-manager-operator
diff --git a/cert-manager-operator/README.md b/cert-manager-operator/README.md
diff --git a/cert-manager-operator/operator/base/namespace.yaml b/cert-manager-operator/operator/base/namespace.yaml
diff --git a/openshift-cert-manager-operator/INFO.md b/openshift-cert-manager-operator/INFO.md
@@ -0,0 +1,4 @@
+# openshift-cert-manager-operator
+
+The cert-manager Operator for Red Hat OpenShift provides seamless support for cert-manager, which automates certificate management.
+For more information, see the [cert-manager Operator for Red Hat OpenShift documentation](https://docs.openshift.com/container-platform/latest/security/cert_manager_operator/index.html).
diff --git a/openshift-cert-manager-operator/README.md b/openshift-cert-manager-operator/README.md
@@ -0,0 +1,35 @@
+# cert-manager Operator for Red Hat OpenShift
+
+Install cert-manager Operator for Red Hat OpenShift.
+
+Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use.
+
+The current *overlays* available are for the following channels:
+
+* [stable-v1](operator/overlays/stable-v1)
+* [stable-v1.10](operator/overlays/stable-v1.10)
+* [stable-v1.11](operator/overlays/stable-v1.11)
+* [tech-preview](operator/overlays/tech-preview)
+
+## Usage
+
+If you have cloned the `gitops-catalog` repository, you can install cert-manager Operator for Red Hat OpenShift based on the overlay of your choice by running from the root (`gitops-catalog`) directory.
+
+```
+oc apply -k openshift-cert-manager-operator/operator/overlays/<channel>
+```
+
+Or, without cloning:
+
+```
+oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-cert-manager-operator/operator/overlays/<channel>
+```
+
+As part of a different overlay in your own GitOps repo:
+
+```
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - https://github.com/redhat-cop/gitops-catalog/openshift-cert-manager-operator/operator/overlays/<channel>?ref=main
+```
diff --git a/...xamples/acs-central-certificate/README.md → ...xamples/acs-central-certificate/README.md b/...xamples/acs-central-certificate/README.md → ...xamples/acs-central-certificate/README.md
diff --git a/...-certificate/acs-central-certificate.yaml → ...-certificate/acs-central-certificate.yaml b/...-certificate/acs-central-certificate.yaml → ...-certificate/acs-central-certificate.yaml
diff --git a/...cs-central-certificate/kustomization.yaml → ...cs-central-certificate/kustomization.yaml b/...cs-central-certificate/kustomization.yaml → ...cs-central-certificate/kustomization.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 

diff --git a/...ples/letsencrypt-route53-issuer/README.md → ...ples/letsencrypt-route53-issuer/README.md b/...ples/letsencrypt-route53-issuer/README.md → ...ples/letsencrypt-route53-issuer/README.md
diff --git a/...encrypt-route53-issuer/kustomization.yaml → ...encrypt-route53-issuer/kustomization.yaml b/...encrypt-route53-issuer/kustomization.yaml → ...encrypt-route53-issuer/kustomization.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 

diff --git a/...suer/letsencrypt-prod-cluster-issuer.yaml → ...suer/letsencrypt-prod-cluster-issuer.yaml b/...suer/letsencrypt-prod-cluster-issuer.yaml → ...suer/letsencrypt-prod-cluster-issuer.yaml
diff --git a/...r/letsencrypt-staging-cluster-issuer.yaml → ...r/letsencrypt-staging-cluster-issuer.yaml b/...r/letsencrypt-staging-cluster-issuer.yaml → ...r/letsencrypt-staging-cluster-issuer.yaml
diff --git a/...mples/openshift-api-certificate/README.md → ...mples/openshift-api-certificate/README.md b/...mples/openshift-api-certificate/README.md → ...mples/openshift-api-certificate/README.md
diff --git a/...nshift-api-certificate/kustomization.yaml → ...nshift-api-certificate/kustomization.yaml b/...nshift-api-certificate/kustomization.yaml → ...nshift-api-certificate/kustomization.yaml
@@ -1,4 +1,3 @@
----
 kind: Kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 

diff --git a/...ertificate/openshift-api-certificate.yaml → ...ertificate/openshift-api-certificate.yaml b/...ertificate/openshift-api-certificate.yaml → ...ertificate/openshift-api-certificate.yaml
diff --git a/...rtificate/patch-cluster-api-cert-job.yaml → ...rtificate/patch-cluster-api-cert-job.yaml b/...rtificate/patch-cluster-api-cert-job.yaml → ...rtificate/patch-cluster-api-cert-job.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -57,6 +58,8 @@ spec:
             - -c
             - |
               #!/usr/bin/env bash
+              # lets try to dynamically get this value ??
+              # API_HOST_NAME=$(oc get secret openshift-api-certificate -n openshift-config -o jsonpath='{.metadata.annotations.cert-manager\.io/common-name}')
               if oc get secret openshift-api-certificate -n openshift-config; then
                 oc patch apiserver cluster --type=merge -p '{"spec":{"servingCerts": {"namedCertificates": [{"names": ["'$API_HOST_NAME'"], "servingCertificate": {"name": "openshift-api-certificate"}}]}}}'
               else

diff --git a/.../openshift-wildcard-certificate/README.md → .../openshift-wildcard-certificate/README.md b/.../openshift-wildcard-certificate/README.md → .../openshift-wildcard-certificate/README.md
diff --git a/...t-wildcard-certificate/kustomization.yaml → ...t-wildcard-certificate/kustomization.yaml b/...t-wildcard-certificate/kustomization.yaml → ...t-wildcard-certificate/kustomization.yaml
@@ -1,4 +1,3 @@
----
 kind: Kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 

diff --git a/...icate/openshift-wildcard-certificate.yaml → ...icate/openshift-wildcard-certificate.yaml b/...icate/openshift-wildcard-certificate.yaml → ...icate/openshift-wildcard-certificate.yaml
diff --git a/...cate/patch-cluster-wildcard-cert-job.yaml → ...cate/patch-cluster-wildcard-cert-job.yaml b/...cate/patch-cluster-wildcard-cert-job.yaml → ...cate/patch-cluster-wildcard-cert-job.yaml
diff --git a/...operator/operator/base/kustomization.yaml → ...operator/operator/base/kustomization.yaml b/...operator/operator/base/kustomization.yaml → ...operator/operator/base/kustomization.yaml
@@ -1,9 +1,6 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: cert-manager-operator
-
 resources:
   - namespace.yaml
   - operator-group.yaml

diff --git a/openshift-cert-manager-operator/operator/base/namespace.yaml b/openshift-cert-manager-operator/operator/base/namespace.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations:
+    openshift.io/display-name: "cert-manager Operator for Red Hat OpenShift"
+  labels:
+    openshift.io/cluster-monitoring: 'true'
+  name: cert-manager-operator
diff --git a/...perator/operator/base/operator-group.yaml → ...perator/operator/base/operator-group.yaml b/...perator/operator/base/operator-group.yaml → ...perator/operator/base/operator-group.yaml
@@ -1,9 +1,8 @@
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-  name: cert-manager-operator
+  name: openshift-cert-manager-operator
   namespace: cert-manager-operator
 spec:
   targetNamespaces:
     - cert-manager-operator
-  upgradeStrategy: Default
diff --git a/...-operator/operator/base/subscription.yaml → ...-operator/operator/base/subscription.yaml b/...-operator/operator/base/subscription.yaml → ...-operator/operator/base/subscription.yaml
@@ -1,12 +1,10 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  labels:
-    operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: ""
   name: openshift-cert-manager-operator
   namespace: cert-manager-operator
 spec:
-  channel: stable-v1
+  channel: patch-me-see-overlays-dir
   installPlanApproval: Automatic
   name: openshift-cert-manager-operator
   source: redhat-operators

diff --git a/openshift-cert-manager-operator/operator/overlays/stable-v1.10/kustomization.yaml b/openshift-cert-manager-operator/operator/overlays/stable-v1.10/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+patches:
+  - target:
+      kind: Subscription
+      name: openshift-cert-manager-operator
+    path: patch-channel.yaml
diff --git a/openshift-cert-manager-operator/operator/overlays/stable-v1.10/patch-channel.yaml b/openshift-cert-manager-operator/operator/overlays/stable-v1.10/patch-channel.yaml
@@ -0,0 +1,3 @@
+- op: replace
+  path: /spec/channel
+  value: stable-v1.10
diff --git a/openshift-cert-manager-operator/operator/overlays/stable-v1.11/kustomization.yaml b/openshift-cert-manager-operator/operator/overlays/stable-v1.11/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+patches:
+  - target:
+      kind: Subscription
+      name: openshift-cert-manager-operator
+    path: patch-channel.yaml
diff --git a/openshift-cert-manager-operator/operator/overlays/stable-v1.11/patch-channel.yaml b/openshift-cert-manager-operator/operator/overlays/stable-v1.11/patch-channel.yaml
@@ -0,0 +1,3 @@
+- op: replace
+  path: /spec/channel
+  value: stable-v1.11
diff --git a/openshift-cert-manager-operator/operator/overlays/stable-v1/kustomization.yaml b/openshift-cert-manager-operator/operator/overlays/stable-v1/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+patches:
+  - target:
+      kind: Subscription
+      name: openshift-cert-manager-operator
+    path: patch-channel.yaml
diff --git a/openshift-cert-manager-operator/operator/overlays/stable-v1/patch-channel.yaml b/openshift-cert-manager-operator/operator/overlays/stable-v1/patch-channel.yaml
@@ -0,0 +1,3 @@
+- op: replace
+  path: /spec/channel
+  value: stable-v1
diff --git a/openshift-cert-manager-operator/operator/overlays/tech-preview/kustomization.yaml b/openshift-cert-manager-operator/operator/overlays/tech-preview/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+patches:
+  - target:
+      kind: Subscription
+      name: openshift-cert-manager-operator
+    path: patch-channel.yaml
diff --git a/openshift-cert-manager-operator/operator/overlays/tech-preview/patch-channel.yaml b/openshift-cert-manager-operator/operator/overlays/tech-preview/patch-channel.yaml
@@ -0,0 +1,3 @@
+- op: replace
+  path: /spec/channel
+  value: tech-preview