Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
codekow committed Nov 12, 2023
1 parent 5175879 commit ffff42d
Show file tree
Hide file tree
Showing 19 changed files with 95 additions and 22 deletions.
4 changes: 4 additions & 0 deletions openshift-cert-manager-operator/INFO.md
Original file line number Diff line number Diff line change
@@ -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).
36 changes: 28 additions & 8 deletions openshift-cert-manager-operator/README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,35 @@
### Introduction
# cert-manager Operator for Red Hat OpenShift

This deploys the cert-manager operator. If you are not familiar with cert-manager, it provisions and manages TLS certificates for you automatically using one or more configured Issuers. It's great for providing a self-service capability around TLS certificates out of the OpenShift platform.
Install cert-manager Operator for Red Hat OpenShift.

Documentation on OpenShift cert-manager is available [here](https://docs.openshift.com/container-platform/4.10/security/cert_manager_operator/index.html).
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.

Community documentation for cert-manager is located [here](https://cert-manager.io/docs/).
The current *overlays* available are for the following channels:

### Examples
* [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)

The examples folder contains some examples of how to use cert-manager including how to use it to provision OpenShift API and Wildcard certificates. There is a README associated with each example when you navigate to each folder.
## Usage

### TODO
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.

At some point I would like to make the examples directly deployable via a Helm chart. The examples are a case which would benefit from Helm templating versus patching in kustomize since many of the values can be derived from two parameters: cluster name and domain.
```
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
```
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
kind: Kustomization
apiVersion: kustomize.config.k8s.io/v1beta1

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
kind: Kustomization
apiVersion: kustomize.config.k8s.io/v1beta1

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

namespace: cert-manager-operator

resources:
- namespace.yaml
- operator-group.yaml
Expand Down
4 changes: 2 additions & 2 deletions openshift-cert-manager-operator/operator/base/namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Namespace
metadata:
annotations:
openshift.io/display-name: Red Hat Certificate Manager Operator
openshift.io/display-name: "cert-manager Operator for Red Hat OpenShift"
labels:
openshift.io/cluster-monitoring: "true"
openshift.io/cluster-monitoring: 'true'
name: cert-manager-operator
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
apiVersion: operators.coreos.com/v1
kind: OperatorGroup
metadata:
name: cert-manager-operator
name: openshift-cert-manager-operator-group
namespace: cert-manager-operator
spec:
targetNamespaces:
- cert-manager-operator
upgradeStrategy: Default
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- op: replace
path: /spec/channel
value: stable-v1.10
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- op: replace
path: /spec/channel
value: stable-v1.11
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- op: replace
path: /spec/channel
value: stable-v1
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- op: replace
path: /spec/channel
value: tech-preview

0 comments on commit ffff42d

Please sign in to comment.