From 338d312edae0da4d666abbf52c0aaa6585e7f387 Mon Sep 17 00:00:00 2001
From: Moritz Graf <github@moritzgraf.de>
Date: Sat, 12 Sep 2020 12:36:17 +0200
Subject: [PATCH] Updating to cert-manager 1.0

---
 k8s/README.md                           | 15 +++++++++------
 k8s/cert-manager/cert-manager.yaml      |  1 +
 k8s/cert-manager/production-issuer.yaml |  2 +-
 k8s/cert-manager/staging-issuer.yaml    |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/k8s/README.md b/k8s/README.md
index 6ab2c78..0a3c1ca 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -59,18 +59,16 @@ helm upgrade --install ingress-nginx ingress-nginx/ingress-nginx -n ingress-ngin
 
 ## [cert-manager](https://cert-manager.io/docs/tutorials/acme/ingress/)
 
-Apply with helm:
+Apply with helm. [See chart.](https://github.com/jetstack/cert-manager):
 
 ```bash
 kubectl create ns cert-manager
 helm repo add jetstack https://charts.jetstack.io
 helm repo update
 helm upgrade --install cert-manager jetstack/cert-manager -n cert-manager -f cert-manager/cert-manager.yaml
-# probably not even needed:
-$ kubectl apply -f https://raw.githubusercontent.com/jetstack/cert-manager/master/deploy/manifests/00-crds.yaml
 # this is required:
-$ kubectl apply -f cert-manager/staging-issuer.yaml
-$ kubectl apply -f cert-manager/production-issuer.yaml
+kubectl apply -f cert-manager/staging-issuer.yaml
+kubectl apply -f cert-manager/production-issuer.yaml
 ```
 
 To test all this you may use the kuaard demo project:
@@ -192,8 +190,13 @@ kubectl apply -f tt-rss/
 
 ## monitoring
 
+The prometheus-operator, now called [kube-prometheus-stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack) is used.
+
 ```sh
-helm upgrade --install prometheus-operator stable/prometheus-operator -n monitoring -f monitoring/prometheus-operator.secret.yml
+kubectl create ns monitoring
+helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+helm repo update
+helm upgrade --install prometheus-operator prometheus-community/kube-prometheus-stack -n monitoring -f monitoring/prometheus-operator.secret.yml
 ```
 
 ## gitea
diff --git a/k8s/cert-manager/cert-manager.yaml b/k8s/cert-manager/cert-manager.yaml
index d6b117a..80bbc33 100644
--- a/k8s/cert-manager/cert-manager.yaml
+++ b/k8s/cert-manager/cert-manager.yaml
@@ -7,3 +7,4 @@ podLabels:
   app: cert-manager
 prometheus:
   enabled: false
+installCRDs: true
\ No newline at end of file
diff --git a/k8s/cert-manager/production-issuer.yaml b/k8s/cert-manager/production-issuer.yaml
index 3aba3e8..b9acefc 100644
--- a/k8s/cert-manager/production-issuer.yaml
+++ b/k8s/cert-manager/production-issuer.yaml
@@ -1,6 +1,6 @@
 # status: implemented
 
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
   name: letsencrypt-prod
diff --git a/k8s/cert-manager/staging-issuer.yaml b/k8s/cert-manager/staging-issuer.yaml
index a3f0feb..51f74ed 100644
--- a/k8s/cert-manager/staging-issuer.yaml
+++ b/k8s/cert-manager/staging-issuer.yaml
@@ -1,6 +1,6 @@
 # status: implemented
 
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
   name: letsencrypt-staging