Fred Damstra (k8s1) пре 2 година
родитељ
комит
0ffd40daa0

+ 9 - 2
Workloads/jenkins/3.deployment.yaml

@@ -32,18 +32,25 @@ spec:
               containerPort: 8080
             - name: jnlpport
               containerPort: 50000
+# 2023-01-31 can't get these to work. By default, host and scheme are blank
 #          livenessProbe:
 #            httpGet:
+#              host: "jenkins.monkeybox.org"
+#              scheme: HTTPS
 #              path: "/login"
-#              port: 8080
+#              #port: 8080
+#              port: 443
 #            initialDelaySeconds: 90
 #            periodSeconds: 10
 #            timeoutSeconds: 5
 #            failureThreshold: 5
 #          readinessProbe:
 #            httpGet:
+#              host: "jenkins.monkeybox.org"
+#              scheme: HTTPS
 #              path: "/login"
-#              port: 8080
+#              #port: 8080
+#              port: 443
 #            initialDelaySeconds: 60
 #            periodSeconds: 10
 #            timeoutSeconds: 5

+ 1 - 1
Workloads/jenkins/4.service.yaml

@@ -26,7 +26,7 @@ kind: Ingress
 metadata:
   name: jenkins
   annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-stage"
+    cert-manager.io/cluster-issuer: "letsencrypt-prod"
     ## No basic auth for smokeping
     ## type of authentication
     #nginx.ingress.kubernetes.io/auth-type: basic

+ 0 - 17
Workloads/jenkins/4b.service.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: jenkins-service
-  namespace: default
-  annotations:
-      prometheus.io/scrape: 'true'
-      prometheus.io/path:   /
-      prometheus.io/port:   '8080'
-spec:
-  selector: 
-    run: jenkins
-  type: NodePort  
-  ports:
-    - port: 8080
-      targetPort: 8080
-      nodePort: 32000