Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .cloudbuild/github-deploy-beta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ steps:
waitFor:
- '-'
entrypoint: /bin/bash
- name: 'golang:1.24'
- name: 'golang:1.25'
args:
- '-c'
- |
Expand Down
2 changes: 1 addition & 1 deletion .cloudbuild/github-deploy-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ steps:
waitFor:
- '-'
entrypoint: /bin/bash
- name: 'golang:1.24'
- name: 'golang:1.25'
args:
- '-c'
- |
Expand Down
2 changes: 1 addition & 1 deletion .cloudbuild/github-deploy-ondemand.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ steps:
waitFor:
- '-'
entrypoint: /bin/bash
- name: 'golang:1.24'
- name: 'golang:1.25'
args:
- '-c'
- |
Expand Down
2 changes: 1 addition & 1 deletion .generated-golangci-depguard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

version: "2"
run:
go: "1.24"
go: "1.25"
allow-parallel-runners: true
linters:
default: none
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pullrequest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@ jobs:
run: |
make check-format-go
- name: Run golangci-lint
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
with:
version: v2.1.6
version: v2.7.1
args: --config=.golangci.yaml
- name: Prepare depguard config for golangci-lint
run: make generate-depguard-rules
- name: Check for diff in depguard config
run: git diff --exit-code .generated-golangci-depguard.yaml
- name: Run golangci-lint for depguard
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
with:
version: v2.1.6
version: v2.7.1
args: --config=.generated-golangci-depguard.yaml --issues-exit-code=0 # This check is currently optional. Remove `--issues-exit-code=0` once issues are fixed.

frontend-tests:
Expand Down Expand Up @@ -176,8 +176,8 @@ jobs:
go-version-file: './go.mod'

- name: Install addlicense package
run: go install github.com/google/addlicense@latest
run: go mod download

- name: Run addlicense
id: license_header_check
run: addlicense -c "Google LLC" -l apache -v -check .
run: go tool addlicense -c "Google LLC" -l apache -v -check .
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: '1.24'
go-version: '1.25'

- name: Setup Node.js
uses: actions/setup-node@v6
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

version: "2"
run:
go: "1.24"
go: "1.25"
allow-parallel-runners: true
linters:
default: none
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.24 AS builder
FROM golang:1.25 AS builder

ENV ROOT=/go/src/app
RUN mkdir /built
Expand Down
2 changes: 1 addition & 1 deletion GEMINI.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ It does not require the installation of agents in the cluster. By simply loading
## Setup Instructions

1. **Install Dependencies:**
* Go 1.24.*
* Go 1.25.*
* Node.js 22.13.*
* `gcloud` CLI
* `jq`
Expand Down
2 changes: 1 addition & 1 deletion README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ KHIは、Google Cloud サポートチームが開発し、その後オープン

#### ビルドに必要な依存関係

- Go 1.24.\*
- Go 1.25.\*
- Node.js 環境 22.13.\*
- [`gcloud` CLI](https://cloud.google.com/sdk/docs/install)
- [`jq`コマンド](https://jqlang.org/)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ For more details, try [Getting started](/docs/en/tutorial/getting-started.md).

#### Prerequisites

- Go 1.24.*
- Go 1.25.*
- Node.js environment 22.13.*
- [`gcloud` CLI](https://cloud.google.com/sdk/docs/install)
- [`jq` command](https://jqlang.org/)
Expand Down
12 changes: 5 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/GoogleCloudPlatform/khi

go 1.24.0

toolchain go1.24.1
go 1.25.5

require (
github.com/google/go-cmp v0.7.0
Expand Down Expand Up @@ -38,6 +36,7 @@ require (
cloud.google.com/go/longrunning v0.7.0 // indirect
cloud.google.com/go/trace v1.11.7 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 // indirect
github.com/bmatcuk/doublestar/v4 v4.0.2 // indirect
github.com/bytedance/gopkg v0.1.3 // indirect
github.com/bytedance/sonic v1.14.2 // indirect
github.com/bytedance/sonic/loader v0.4.0 // indirect
Expand All @@ -49,7 +48,7 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/goccy/go-yaml v1.19.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/addlicense v1.2.0 // indirect
github.com/google/pprof v0.0.0-20251114195745-4902fdda35c8 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/google/uuid v1.6.0 // indirect
Expand All @@ -66,16 +65,13 @@ require (
go.uber.org/mock v0.6.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
golang.org/x/arch v0.23.0 // indirect
golang.org/x/mod v0.30.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/tools v0.39.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
Expand Down Expand Up @@ -111,3 +107,5 @@ require (
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.34.2
)

tool github.com/google/addlicense
Loading