From 296e9e4bcdc7c3cf490d12f686c14ba8ef36a502 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Thu, 13 Feb 2025 17:04:51 -0800
Subject: [PATCH 1/2] Remove unused pd-ssd storageclass + make clusterIssuer
 optional

In clusters where there's already a clusterissuer set up, we don't
need to run a cluster issuer ourselves.

Ref https://github.com/jupyterhub/mybinder.org-deploy/issues/3222
---
 mybinder/templates/cluster-issuer.yaml | 2 ++
 mybinder/templates/pd-ssd.yaml         | 9 ---------
 mybinder/values.yaml                   | 3 +++
 3 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 mybinder/templates/pd-ssd.yaml

diff --git a/mybinder/templates/cluster-issuer.yaml b/mybinder/templates/cluster-issuer.yaml
index 9efbce6a8..ba338f8f8 100644
--- a/mybinder/templates/cluster-issuer.yaml
+++ b/mybinder/templates/cluster-issuer.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.clusterIssuer.enabled }}
 ---
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
@@ -28,3 +29,4 @@ spec:
       - http01:
           ingress:
             class: nginx
+{{- end }}
\ No newline at end of file
diff --git a/mybinder/templates/pd-ssd.yaml b/mybinder/templates/pd-ssd.yaml
deleted file mode 100644
index e935b4149..000000000
--- a/mybinder/templates/pd-ssd.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Create an SSD StorageClass for use by Prometheus
-# See https://kubernetes.io/docs/concepts/storage/storage-classes/#gce for details
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: ssd
-provisioner: kubernetes.io/gce-pd
-parameters:
-  type: pd-ssd
diff --git a/mybinder/values.yaml b/mybinder/values.yaml
index 2a39ec4a2..6c522fcf5 100644
--- a/mybinder/values.yaml
+++ b/mybinder/values.yaml
@@ -727,3 +727,6 @@ awsEcrRegistryCleaner:
 
 localpv-provisioner:
   enabled: false
+
+clusterIssuer:
+  enabled: true
\ No newline at end of file

From 37b3fe7a48e740b0169d86f560f4dd095fe14f5c Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Fri, 14 Feb 2025 01:05:48 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 mybinder/templates/cluster-issuer.yaml | 2 +-
 mybinder/values.yaml                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mybinder/templates/cluster-issuer.yaml b/mybinder/templates/cluster-issuer.yaml
index ba338f8f8..5a623f7fa 100644
--- a/mybinder/templates/cluster-issuer.yaml
+++ b/mybinder/templates/cluster-issuer.yaml
@@ -29,4 +29,4 @@ spec:
       - http01:
           ingress:
             class: nginx
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/mybinder/values.yaml b/mybinder/values.yaml
index 6c522fcf5..8eb5fa52e 100644
--- a/mybinder/values.yaml
+++ b/mybinder/values.yaml
@@ -729,4 +729,4 @@ localpv-provisioner:
   enabled: false
 
 clusterIssuer:
-  enabled: true
\ No newline at end of file
+  enabled: true