From 0a1c76ef36c696a9557981f26d5614f269669e8d Mon Sep 17 00:00:00 2001
From: Fabian Kamp <Fabian.Kamp@LM-AG.de>
Date: Mon, 8 Jan 2024 12:23:45 +0100
Subject: [PATCH 1/4] Remove cert-manager from dependencies
---
.../RecordingBot/deploy/teams-recording-bot/Chart.lock | 7 ++-----
.../RecordingBot/deploy/teams-recording-bot/Chart.yaml | 6 +-----
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/Chart.lock b/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/Chart.lock
index 0c9936e0e..8952b78e3 100644
--- a/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/Chart.lock
+++ b/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/Chart.lock
@@ -1,9 +1,6 @@
dependencies:
-- name: cert-manager
- repository: https://charts.jetstack.io
- version: v1.13.2
- name: ingress-nginx
repository: https://kubernetes.github.io/ingress-nginx
version: 4.8.3
-digest: sha256:c2ebed9bfcf0ae016d15b576453e9e42a459b1e4d4bf9c1f8ed6ef763c91f46f
-generated: "2023-11-27T14:29:26.6895132+01:00"
+digest: sha256:7dafa2cf6d937c80fb3cd1791ad242b055f9dc67931e216b6da22350c534177b
+generated: "2024-01-08T12:22:54.332827+01:00"
diff --git a/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/Chart.yaml b/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/Chart.yaml
index 89bcee9eb..f46756b76 100644
--- a/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/Chart.yaml
+++ b/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/Chart.yaml
@@ -16,7 +16,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.0
+version: 1.3.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
@@ -24,10 +24,6 @@ version: 1.3.0
appVersion: 1.2.0
dependencies:
- - name: cert-manager
- version: v1.13.2
- repository: https://charts.jetstack.io
- alias: cert-manager
- name: ingress-nginx
version: 4.8.3
repository: https://kubernetes.github.io/ingress-nginx
From 2979f0043258a25aa9ec134034125d67770e3caa Mon Sep 17 00:00:00 2001
From: Fabian Kamp <Fabian.Kamp@LM-AG.de>
Date: Mon, 8 Jan 2024 13:55:24 +0100
Subject: [PATCH 2/4] Add cert-manager installation script
---
.../deploy/cert-manager/install.bat | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 Samples/PublicSamples/RecordingBot/deploy/cert-manager/install.bat
diff --git a/Samples/PublicSamples/RecordingBot/deploy/cert-manager/install.bat b/Samples/PublicSamples/RecordingBot/deploy/cert-manager/install.bat
new file mode 100644
index 000000000..cae9fbe93
--- /dev/null
+++ b/Samples/PublicSamples/RecordingBot/deploy/cert-manager/install.bat
@@ -0,0 +1,20 @@
+@echo off
+
+echo Updating helm repo
+helm repo add jetstack https://charts.jetstack.io
+helm repo update
+
+echo Installing cert-manager
+helm upgrade ^
+ cert-manager jetstack/cert-manager ^
+ --namespace cert-manager ^
+ --create-namespace ^
+ --version v1.13.3 ^
+ --install ^
+ --set nodeSelector."kubernetes\.io/os"=linux ^
+ --set webhook.nodeSelector."kubernetes\.io/os"=linux ^
+ --set cainjector.nodeSelector."kubernetes\.io/os"=linux ^
+ --set installCRDs=true
+
+echo Waiting for cert-manager to be ready
+kubectl wait pod -n cert-manager --for condition=ready --timeout=60s --all
\ No newline at end of file
From c51e19dbe6b0a9bbd1ad8521aaf73f633d456ad1 Mon Sep 17 00:00:00 2001
From: Fabian Kamp <Fabian.Kamp@LM-AG.de>
Date: Mon, 8 Jan 2024 14:00:54 +0100
Subject: [PATCH 3/4] Move installation of Cluster issuer to cert-manager
installation
---
.../templates => cert-manager}/cluster-issuer.yaml | 7 +------
.../RecordingBot/deploy/cert-manager/install.bat | 5 ++++-
2 files changed, 5 insertions(+), 7 deletions(-)
rename Samples/PublicSamples/RecordingBot/deploy/{teams-recording-bot/templates => cert-manager}/cluster-issuer.yaml (53%)
diff --git a/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/templates/cluster-issuer.yaml b/Samples/PublicSamples/RecordingBot/deploy/cert-manager/cluster-issuer.yaml
similarity index 53%
rename from Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/templates/cluster-issuer.yaml
rename to Samples/PublicSamples/RecordingBot/deploy/cert-manager/cluster-issuer.yaml
index 352790835..a250b0a4b 100644
--- a/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/templates/cluster-issuer.yaml
+++ b/Samples/PublicSamples/RecordingBot/deploy/cert-manager/cluster-issuer.yaml
@@ -2,15 +2,10 @@ apiVersion: cert-manager.io/v1
kind: ClusterIssuer
metadata:
name: letsencrypt
- namespace: {{ index .Values "cert-manager" "namespace" }}
- labels:
- helmVersion: {{ .Chart.Version }}
- helmAppVersion: {{ .Chart.AppVersion }}
- helmName: {{ .Chart.Name }}
spec:
acme:
server: https://acme-v02.api.letsencrypt.org/directory
- email: {{ index .Values "cert-manager" "issuerEmail" }}
+ email: YOUR_EMAIL
privateKeySecretRef:
name: letsencrypt
solvers:
diff --git a/Samples/PublicSamples/RecordingBot/deploy/cert-manager/install.bat b/Samples/PublicSamples/RecordingBot/deploy/cert-manager/install.bat
index cae9fbe93..7a36fbd5a 100644
--- a/Samples/PublicSamples/RecordingBot/deploy/cert-manager/install.bat
+++ b/Samples/PublicSamples/RecordingBot/deploy/cert-manager/install.bat
@@ -17,4 +17,7 @@ helm upgrade ^
--set installCRDs=true
echo Waiting for cert-manager to be ready
-kubectl wait pod -n cert-manager --for condition=ready --timeout=60s --all
\ No newline at end of file
+kubectl wait pod -n cert-manager --for condition=ready --timeout=60s --all
+
+echo Installing cluster issuer
+kubectl apply -f cluster-issuer.yaml
\ No newline at end of file
From 6afd173236d0e7bec8f3468d814511bf54ff7e69 Mon Sep 17 00:00:00 2001
From: Fabian Kamp <Fabian.Kamp@LM-AG.de>
Date: Mon, 8 Jan 2024 14:01:15 +0100
Subject: [PATCH 4/4] Remove cert-manager settings from values.yaml
---
.../deploy/teams-recording-bot/values.yaml | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/values.yaml b/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/values.yaml
index 64ba5c739..c5266122f 100644
--- a/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/values.yaml
+++ b/Samples/PublicSamples/RecordingBot/deploy/teams-recording-bot/values.yaml
@@ -60,19 +60,6 @@ resources: {}
# cpu: 100m
# memory: 128Mi
-cert-manager:
- namespace: cert-manager
- installCRDs: true
- issuerEmail: YOUR EMAIL
- nodeSelector:
- "kubernetes.io/os": linux
- webhook:
- nodeSelector:
- "kubernetes.io/os": linux
- caininjector:
- nodeSelector:
- "kubernetes.io/os": linux
-
ingress-nginx:
namespaceOverride: ingress-nginx
controller: