Skip to content

Commit c51f5a1

Browse files
committed
Added jenkins, fixed other apps
1 parent 6341a0e commit c51f5a1

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

apps/grafana/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ ingress:
143143
kubernetes.io/ingress.class: nginx
144144
# kubernetes.io/tls-acme: "true"
145145
labels: {}
146-
path: /grafana
146+
path: /
147147
hosts:
148-
- kubernetes.local
148+
- grafana.kubernetes.local
149149
## Extra paths to prepend to every host configuration. This is useful when working with annotation based services.
150150
extraPaths: []
151151
# - path: /*

apps/ingress/values.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ controller:
140140

141141
## DaemonSet or Deployment
142142
##
143-
kind: Deployment
143+
kind: DaemonSet
144144

145145
## Annotations to be added to the controller deployment
146146
##
@@ -388,9 +388,9 @@ controller:
388388
enabled: true
389389

390390
service:
391-
annotations: {}
392-
# prometheus.io/scrape: "true"
393-
# prometheus.io/port: "10254"
391+
annotations:
392+
prometheus.io/scrape: "true"
393+
prometheus.io/port: "10254"
394394

395395
## Deprecated, instead simply do not provide a clusterIP value
396396
omitClusterIP: false
@@ -422,7 +422,7 @@ controller:
422422
enabled: false
423423
additionalLabels: {}
424424
namespace: ""
425-
rules: []
425+
rules: []
426426
# # These are just examples rules, please adapt them to your needs
427427
# - alert: TooMany500s
428428
# expr: 100 * ( sum( nginx_ingress_controller_requests{status=~"5.+"} ) / sum(nginx_ingress_controller_requests) ) > 5
@@ -458,7 +458,7 @@ defaultBackend:
458458
##
459459
enabled: true
460460

461-
name: default-backend
461+
name: default-http-backend
462462
image:
463463
repository: k8s.gcr.io/defaultbackend-amd64
464464
tag: "1.5"

apps/jenkins/values.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ master:
146146
targetPort: 8080
147147
# For minikube, set this to NodePort, elsewhere use LoadBalancer
148148
# Use ClusterIP if your setup includes ingress controller
149-
serviceType: LoadBalancer
149+
serviceType: ClusterIP
150150
# Jenkins master service annotations
151151
serviceAnnotations: {}
152152
# Jenkins master custom labels
@@ -380,7 +380,7 @@ master:
380380
overwriteJobs: false
381381

382382
ingress:
383-
enabled: false
383+
enabled: true
384384
# Override for the default paths that map requests to the backend
385385
paths: []
386386
# - backend:
@@ -394,13 +394,13 @@ master:
394394
# For Kubernetes v1.14+, use 'networking.k8s.io/v1beta1'
395395
apiVersion: "extensions/v1beta1"
396396
labels: {}
397-
annotations: {}
398-
# kubernetes.io/ingress.class: nginx
397+
annotations:
398+
kubernetes.io/ingress.class: nginx
399399
# kubernetes.io/tls-acme: "true"
400400
# Set this path to jenkinsUriPrefix above or use annotations to rewrite path
401-
# path: "/jenkins"
401+
path: /
402402
# configures the hostname e.g. jenkins.example.com
403-
hostName:
403+
hostName: jenkins.kubernetes.local
404404
tls:
405405
# - secretName: jenkins.cluster.local
406406
# hosts:
@@ -608,7 +608,7 @@ persistence:
608608
##
609609
storageClass: nfs
610610
annotations: {}
611-
accessMode: "ReadWriteOnce"
611+
accessMode: "ReadWriteMany"
612612
size: "8Gi"
613613
volumes:
614614
# - name: nothing

apps/prometheus/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ alertmanager:
121121
## Must be provided if Ingress is enabled
122122
##
123123
hosts:
124-
- kubernetes.local/alertmanager
124+
- alertmanager.kubernetes.local
125125
# - alertmanager.domain.com
126126
# - domain.com/alertmanager
127127

@@ -706,7 +706,7 @@ server:
706706
## Must be provided if Ingress is enabled
707707
##
708708
hosts:
709-
- kubernetes.local/prometheus
709+
- prometheus.kubernetes.local
710710
# - prometheus.domain.com
711711
# - domain.com/prometheus
712712

@@ -1000,7 +1000,7 @@ pushgateway:
10001000
## Must be provided if Ingress is enabled
10011001
##
10021002
hosts:
1003-
- kubernetes.local/pushgateway
1003+
- pushgateway.kubernetes.local
10041004
# - pushgateway.domain.com
10051005
# - domain.com/pushgateway
10061006

0 commit comments

Comments
 (0)