Skip to content

Commit a7fc96b

Browse files
committed
Merge branch 'develop'
2 parents 545453e + e2ebbde commit a7fc96b

File tree

13 files changed

+1422
-76
lines changed

13 files changed

+1422
-76
lines changed

.gitignore

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
1+
### editor
12
.vs/
23
.vscode/
34
.idea/
45

6+
### terraform
7+
.terraform/
8+
.terraform.lock.hcl
9+
*.tfstate
10+
11+
### python
512
__pycache__/
613
.pytest_cache/
714
venv/
815

16+
### temp
917
temp/
1018
*-temp.*
1119

12-
nohup.*
13-
20+
### files
1421
*.crt
1522
*.csr
1623
*.jar

helm/helm-commands.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ helm list --all
4747
helm show chart ingress-nginx/ingress-nginx
4848
helm show readme ingress-nginx/ingress-nginx
4949
helm show values ingress-nginx/ingress-nginx
50+
helm show values --version 5.7.12 jenkins/jenkins
5051

5152
### push (plugin)
5253
helm cm-push tomcat-9.0.0.tgz local-harbor

jenkins/helm/helm-install-jenkins.sh

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

jenkins/helm/jenkins.tf

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
provider "helm" {
2+
kubernetes {
3+
config_path = "~/.kube/config"
4+
}
5+
}
6+
7+
resource "helm_release" "jenkins" {
8+
name = "jenkins"
9+
namespace = "jenkins"
10+
create_namespace = true
11+
repository = "https://charts.jenkins.io"
12+
chart = "jenkins"
13+
version = "5.7.12"
14+
values = [
15+
file("values.yaml")
16+
]
17+
set {
18+
name = "controller.admin.password"
19+
value = "admin"
20+
}
21+
}

0 commit comments

Comments
 (0)