Migrate SSL cert out of the main set and dont delete
diff --git a/Makefile b/Makefile
index e88a737..a4d5d43 100644
--- a/Makefile
+++ b/Makefile
@@ -9,4 +9,7 @@
undeploy:
make -C operator-configs undeploy
+mrclean:
+ make -C operator-configs mrclean
+
.PHONY: deploy
diff --git a/operator-configs/Makefile b/operator-configs/Makefile
index f5112d4..288985e 100644
--- a/operator-configs/Makefile
+++ b/operator-configs/Makefile
@@ -4,10 +4,18 @@
@cat configmap.yaml $(HOME)/.gke-jenkins/oauth-credentials.yaml \
| kubectl apply -f -
@kubectl apply -f mendel-linux.yaml
+ @kubectl apply -f ssl-cert.yaml
@kubectl apply -f ingress.yaml
undeploy:
- @kubectl delete -f .
+ @kubectl delete -f ingress.yaml
+ @kubectl delete -f mendel-linux.yaml
+ @kubectl delete -f configmap.yaml
+ @kubectl delete -f 01-all-in-one-v1alpha2.yaml
+ @kubectl delete -f 00-jenkins_v1alpha2_jenkins_crd.yaml
+
+mrclean: undeploy
+ @kubectl delete -f ssl-cert.yaml
$(HOME)/.gke-jenkins/oauth-credentials.yaml:
../tools/generate-oauth-credentials.sh
diff --git a/operator-configs/configmap.yaml b/operator-configs/configmap.yaml
index 5b70c7c..edb5626 100644
--- a/operator-configs/configmap.yaml
+++ b/operator-configs/configmap.yaml
@@ -21,7 +21,7 @@
scm:
git:
remote: https://coral.googlesource.com/gke-jenkins
- 2-custom-views.yaml: |
+ # The jenkins: stanza must be the last one in this list for credentials to work!
jenkins:
views:
- all:
@@ -36,7 +36,7 @@
- "lastDuration"
- "buildButton"
description: "All Core Packages"
- includeRegex: "^core\\..*"
+ includeRegex: "^core.*"
name: "core"
- list:
columns:
@@ -48,6 +48,5 @@
- "lastDuration"
- "buildButton"
description: "All Enterprise Packages"
- includeRegex: "^enterprise\\..*"
+ includeRegex: "^enterprise.*"
name: "enterprise"
- 3-google-oauth-login.yaml: |
diff --git a/operator-configs/ingress.yaml b/operator-configs/ingress.yaml
index d5f0c8d..18ec19e 100644
--- a/operator-configs/ingress.yaml
+++ b/operator-configs/ingress.yaml
@@ -14,15 +14,6 @@
targetPort: 8080
---
-apiVersion: networking.gke.io/v1beta1
-kind: ManagedCertificate
-metadata:
- name: mendel-linux-ssl-cert
-spec:
- domains:
- - mendel-linux.org
-
----
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
diff --git a/operator-configs/ssl-cert.yaml b/operator-configs/ssl-cert.yaml
new file mode 100644
index 0000000..bb4398a
--- /dev/null
+++ b/operator-configs/ssl-cert.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: networking.gke.io/v1beta1
+kind: ManagedCertificate
+metadata:
+ name: mendel-linux-ssl-cert
+spec:
+ domains:
+ - mendel-linux.org
diff --git a/tools/generate-oauth-credentials.sh b/tools/generate-oauth-credentials.sh
index fa9edcc..22c39c3 100755
--- a/tools/generate-oauth-credentials.sh
+++ b/tools/generate-oauth-credentials.sh
@@ -9,7 +9,6 @@
read -p "Please enter the OAuth2 Client Secret here: " clientsecret
cat <<EOF > $HOME/.gke-jenkins/oauth-credentials.yaml
- jenkins:
securityRealm:
googleOAuth2:
clientId: "${clientid}"
