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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ GO_DIR := $(OUTPUT_DIR)/go

# Base image used for all golang containers
# Uses trusted google-built golang image
GOLANG_IMAGE_VERSION := 1.25.7
GOLANG_IMAGE_VERSION := 1.25.8

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This version is being updated manually. For consistency with other dependencies in this Makefile (like DEBIAN_BASE_IMAGE on line 47 and GIT_SYNC_VERSION on line 94), consider adding a script to automatically find and update the GOLANG_IMAGE_VERSION. This would improve maintainability and reduce manual effort for future updates.

GOLANG_IMAGE := google-go.pkg.dev/golang:$(GOLANG_IMAGE_VERSION)
# Base image used for debian containers
# When updating you can use this command:
Expand Down Expand Up @@ -82,7 +82,7 @@ KUSTOMIZE_VERSION := v5.4.2-gke.4
KUSTOMIZE := $(BIN_DIR)/kustomize
KUSTOMIZE_STAGING_DIR := $(OUTPUT_DIR)/third_party/kustomize

HELM_VERSION := v3.18.6-gke.3
HELM_VERSION := v3.20.0-gke.1

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Similar to the Go image version, consider adding a script to automate updating the HELM_VERSION. This would align with the approach used for other dependencies like DEBIAN_BASE_IMAGE and GIT_SYNC_VERSION, making the update process more consistent and less manual.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update version in tool_util.go

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

HELM := $(BIN_DIR)/helm
HELM_STAGING_DIR := $(OUTPUT_DIR)/third_party/helm

Expand Down
2 changes: 1 addition & 1 deletion pkg/hydrate/tool_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import (

const (
// HelmVersion is the recommended version of Helm for hydration.
HelmVersion = "v3.18.6-gke.3"
HelmVersion = "v3.20.0-gke.1"
// KustomizeVersion is the recommended version of Kustomize for hydration.
KustomizeVersion = "v5.4.2-gke.4"
// Helm is the binary name of the installed Helm.
Expand Down