Skip to content

Commit 190877b

Browse files
committed
Merge branch 'feature/jenkins' into develop
2 parents ea1c756 + f87a4f0 commit 190877b

File tree

2 files changed

+64
-4
lines changed

2 files changed

+64
-4
lines changed

jenkins/helm/jenkins-istio.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
apiVersion: networking.istio.io/v1
3+
kind: Gateway
4+
metadata:
5+
name: jenkins-gw
6+
namespace: jenkins
7+
spec:
8+
selector:
9+
istio: ingressgateway
10+
servers:
11+
- port:
12+
number: 80
13+
name: http
14+
protocol: HTTP
15+
hosts:
16+
- jenkins.example.com
17+
---
18+
apiVersion: networking.istio.io/v1
19+
kind: VirtualService
20+
metadata:
21+
name: jenkins-vs
22+
namespace: jenkins
23+
spec:
24+
hosts:
25+
- jenkins.example.com
26+
gateways:
27+
- jenkins-gw
28+
http:
29+
- match:
30+
- uri:
31+
prefix: /
32+
route:
33+
- destination:
34+
host: jenkins.jenkins.svc.cluster.local
35+
port:
36+
number: 8080
37+
---
38+
apiVersion: networking.istio.io/v1
39+
kind: DestinationRule
40+
metadata:
41+
name: jenkins-dr
42+
namespace: jenkins
43+
spec:
44+
host: jenkins.jenkins.svc.cluster.local
45+
trafficPolicy:
46+
loadBalancer:
47+
simple: ROUND_ROBIN

jenkins/helm/jenkins.tf

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,34 @@
1+
provider "kubernetes" {
2+
config_path = "~/.kube/config"
3+
}
4+
15
provider "helm" {
26
kubernetes {
37
config_path = "~/.kube/config"
48
}
59
}
610

11+
resource "kubernetes_namespace" "jenkins" {
12+
metadata {
13+
name = "jenkins"
14+
labels = {
15+
"istio-injection" = "enabled"
16+
}
17+
}
18+
}
19+
720
resource "helm_release" "jenkins" {
821
name = "jenkins"
9-
namespace = "jenkins"
10-
create_namespace = true
1122
repository = "https://charts.jenkins.io"
1223
chart = "jenkins"
1324
version = "5.7.12"
1425
values = [
15-
file("values.yaml")
26+
file("${path.module}/values.yaml")
1627
]
1728
set {
18-
name = "controller.admin.password"
29+
name = "controller.admin.password"
1930
value = "admin"
2031
}
32+
namespace = kubernetes_namespace.jenkins.metadata.0.name
33+
depends_on = [kubernetes_namespace.jenkins]
2134
}

0 commit comments

Comments
 (0)