Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: issues 38, 39 and 45 #50

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix: issues 38, 39 and 45 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67ff226
updated plugins version
euliancom Jun 16, 2021
3b560bc
fixed issue 38
euliancom Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions jenkins-gke/tf-gke/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,8 @@ data "local_file" "helm_chart_values" {

resource "helm_release" "jenkins" {
name = "jenkins"
repository = "https://kubernetes-charts.storage.googleapis.com"
repository = "https://charts.jenkins.io"
chart = "jenkins"
version = "1.9.18"
timeout = 1200

values = [data.local_file.helm_chart_values.content]
Expand Down
1 change: 0 additions & 1 deletion jenkins-gke/tf-gke/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ module "gke_auth" {

provider "helm" {
kubernetes {
load_config_file = false
cluster_ca_certificate = module.gke_auth.cluster_ca_certificate
host = module.gke_auth.host
token = module.gke_auth.token
Expand Down
22 changes: 11 additions & 11 deletions jenkins-gke/tf-gke/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

master:
tag: "2.248"
controller:
tag: "2.289.1-jdk11"
containerEnv:
- name: PROJECT_ID
valueFrom:
Expand Down Expand Up @@ -43,19 +43,19 @@ master:
servicePort: 80
serviceType: LoadBalancer
installPlugins:
- kubernetes:1.26.2
- workflow-job:2.39
- kubernetes:1.30.0
- workflow-job:2.41
- workflow-aggregator:2.6
- credentials-binding:1.23
- git:4.3.0
- blueocean:1.23.2
- credentials-binding:1.25
- git:4.7.2
- blueocean:1.24.7
- docker-custom-build-environment:1.7.3
- credentials:2.3.11
- credentials:2.5
- docker-commons:1.17
- docker-workflow:1.23
- docker-workflow:1.26
- job-dsl:1.77
- configuration-as-code:1.41
- jdk-tool:1.4
- configuration-as-code:1.51
- jdk-tool:1.5
JCasC:
enabled: true
configScripts:
Expand Down