Skip to content

Commit 3c37c9c

Browse files
committed
Merge branch 'develop'
2 parents a7fc96b + b199336 commit 3c37c9c

14 files changed

+139
-46
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
.terraform/
88
.terraform.lock.hcl
99
*.tfstate
10+
*.tfstate.*
1011

1112
### python
1213
__pycache__/

cert-manager/all.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

cert-manager/cert-manager-commands.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ kubectl cert-manager inspect secret minio1-cert
99

1010
######################################################################
1111

12-
### debuggging
12+
### debug
1313

1414
kubectl get endpoints -n cert-manager my-cert-manager-webhook

cert-manager/cert-manager-namespace.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

cert-manager/helm/cert-manager.tf

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
provider "kubernetes" {
2+
config_path = "~/.kube/config"
3+
}
4+
5+
provider "helm" {
6+
kubernetes {
7+
config_path = "~/.kube/config"
8+
}
9+
}
10+
11+
resource "kubernetes_namespace" "cert_manager" {
12+
metadata {
13+
name = "cert-manager"
14+
labels = {
15+
"istio-injection" = "enabled"
16+
}
17+
}
18+
}
19+
20+
resource "helm_release" "cert_manager" {
21+
name = "cert-manager"
22+
repository = "https://charts.jetstack.io"
23+
chart = "cert-manager"
24+
version = "v1.16.1"
25+
set {
26+
name = "crds.enabled"
27+
value = true
28+
}
29+
namespace = kubernetes_namespace.cert_manager.metadata.0.name
30+
depends_on = [kubernetes_namespace.cert_manager]
31+
}

cert-manager/helm/helm-install-cert-manager.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
provider "kubernetes" {
2+
config_path = "~/.kube/config"
3+
}
4+
5+
resource "kubernetes_manifest" "selfsigned_cluster_issuer" {
6+
manifest = yamldecode(file("${path.module}/selfsigned-cluster-issuer.yaml"))
7+
}
8+
9+
# resource "kubernetes_manifest" "selfsigned_issuer" {
10+
# manifest = yamldecode(file("${path.module}/selfsigned-issuer.yaml"))
11+
# }

cert-manager/issuer/selfsigned-cluster-issuer.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
apiVersion: cert-manager.io/v1
32
kind: ClusterIssuer
43
metadata:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
---
21
apiVersion: cert-manager.io/v1
32
kind: Issuer
43
metadata:
54
name: selfsigned-issuer
5+
# namespace: default
66
spec:
77
selfSigned: {}

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
}

macos/hostctl/README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# hostctl
2+
3+
## Install
4+
5+
### Homebrew
6+
7+
```sh
8+
brew install guumaster/tap/hostctl
9+
```
10+
11+
## References
12+
13+
- hostctl website: <https://guumaster.github.io/hostctl/>
14+
- hostctl github: <https://github.com/guumaster/hostctl>

macos/hostctl/hostctl-commands.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
######################################################################
2+
3+
hostctl list
4+
### +---------+--------+-----------------+---------------------+
5+
### | PROFILE | STATUS | IP | DOMAIN |
6+
### +---------+--------+-----------------+---------------------+
7+
### | default | on | 127.0.0.1 | localhost |
8+
### | default | on | 255.255.255.255 | broadcasthost |
9+
### | default | on | ::1 | localhost |
10+
### +---------+--------+-----------------+---------------------+
11+
12+
######################################################################
13+
14+
hostctl add k8s < k8s.hosts
15+
hostctl replace k8s < k8s.hosts

macos/hostctl/k8s.hosts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
127.0.0.1 jenkins.example.com

0 commit comments

Comments
 (0)