Skip to content

Commit 82b64fa

Browse files
chore: (PSKD-1389) Dependency Version Bumps (#233)
* changed versions * changed terraform module * updated google version * changed versions * Update linter-analysis.yaml
1 parent 43a52e3 commit 82b64fa

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

.github/workflows/linter-analysis.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Linter Analysis
22
on:
33
push:
4-
branches: [ '**' ] # '**' will cause the workflow to run on all commits to all branches, including those with path separators
4+
branches: ['**'] # '**' will cause the workflow to run on all commits to all branches.
55

66
jobs:
77
# Hadolint: Job-1
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
severity: error
3434

35-
# TFLint: Job-3
35+
# TFLint: Job-3 (For GCP)
3636
TFLint:
3737
name: TFLint
3838
runs-on: ubuntu-latest
@@ -46,6 +46,12 @@ jobs:
4646
path: ~/.tflint.d/plugins
4747
key: ubuntu-latest-tflint-${{ hashFiles('.tflint.hcl') }}
4848

49+
- name: Setup Terraform
50+
uses: hashicorp/setup-terraform@v3
51+
with:
52+
terraform_version: "^1.10.5"
53+
terraform_wrapper: false
54+
4955
- name: Setup TFLint
5056
uses: terraform-linters/[email protected]
5157
with:
@@ -55,8 +61,6 @@ jobs:
5561
- name: Initializing viya4-iac-gcp
5662
run: terraform init
5763

58-
# Necessary so we can recursively tflint our modules folder
59-
# not needed for regular project use.
6064
- name: Initializing viya4-iac-gcp/modules/google_vm
6165
run: terraform -chdir=modules/google_vm init
6266

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
ARG TERRAFORM_VERSION=1.9.6
5-
ARG GCP_CLI_VERSION=496.0.0
4+
ARG TERRAFORM_VERSION=1.10.5
5+
ARG GCP_CLI_VERSION=513.0.0
66

77
FROM hashicorp/terraform:$TERRAFORM_VERSION AS terraform
88
FROM google/cloud-sdk:$GCP_CLI_VERSION-alpine
9-
ARG KUBECTL_VERSION=1.30.6
9+
ARG KUBECTL_VERSION=1.30.10
1010
ARG ENABLE_GKE_GCLOUD_AUTH_PLUGIN=True
1111
ARG INSTALL_COMPONENTS=""
1212

versions.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@ terraform {
77
required_providers {
88
google = {
99
source = "hashicorp/google"
10-
version = "6.6.0"
10+
version = "6.24.0"
1111
}
1212
google-beta = {
1313
source = "hashicorp/google-beta"
14-
version = "6.6.0"
14+
version = "6.24.0"
1515
}
1616
kubernetes = {
1717
source = "hashicorp/kubernetes"
18-
version = "~> 2.32" # Constrained by Google
18+
version = "~> 2.36" # Constrained by Google
1919
}
2020
local = {
2121
source = "hashicorp/local"
22-
version = "~> 2.5"
22+
version = "~> 2.5.2"
2323
}
2424
random = {
2525
source = "hashicorp/random"
26-
version = "~> 3.6" # Constrained by Google
26+
version = "~> 3.7.1" # Constrained by Google
2727
}
2828
null = {
2929
source = "hashicorp/null"
3030
version = "~> 3.2" # Constrained by Google
3131
}
3232
external = {
3333
source = "hashicorp/external"
34-
version = "~> 2.3" # Constrained by Google
34+
version = "~> 2.3.4" # Constrained by Google
3535
}
3636
time = {
3737
source = "hashicorp/time"

0 commit comments

Comments
 (0)