Skip to content

Commit 401028b

Browse files
cowskingdependabot[bot]tiffanny29631
authored
Cherrypick 1.23 (#2053)
* chore: bump go.opentelemetry.io/otel from 1.39.0 to 1.40.0 (#2036) Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.39.0 to 1.40.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.39.0...v1.40.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel dependency-version: 1.40.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump to Go 1.25.6 (#2042) * test: Fix test-git-server node affinity errors on Autopilot (#2033) Set empty nodeSelector and add resource requirements for Autopilot clusters to resolve optimize-utilization-scheduler scheduling failures. Example failure https://storage.googleapis.com/oss-prow-build-kpt-config-sync/logs/kpt-config-sync-autopilot-stable/2016983552020713472/build-log.txthttps://storage.googleapis.com/oss-prow-build-kpt-config-sync/logs/kpt-config-sync-autopilot-stable/2016983552020713472/build-log.txt * chore: bump go.opentelemetry.io/otel/sdk from 1.39.0 to 1.40.0 (#2037) Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.39.0 to 1.40.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.39.0...v1.40.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/sdk dependency-version: 1.40.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update Helm version to v3.18.6-gke.3 (#2045) * chore: bump google.golang.org/api from 0.264.0 to 0.265.0 (#2044) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.264.0 to 0.265.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](googleapis/google-api-go-client@v0.264.0...v0.265.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-version: 0.265.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump otelcontribcol to v0.127.0-gke.5 (#2046) * chore: bump go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc (#2038) Bumps [go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc](https://github.com/open-telemetry/opentelemetry-go) from 1.39.0 to 1.40.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.39.0...v1.40.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc dependency-version: 1.40.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump git-sync to v4.4.2-gke.14 (#2048) * chore: bump git-sync to v4.4.2-gke.14 * chore: bump to Go 1.25.7 * chore: bump otelcontribcol to v0.127.0-gke.6 (#2049) * chore: update kustomize to v5.4.2-gke.3 (#2050) * chore: update kustomize to v5.4.2-gke.4 (#2051) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tiffany Pei <tiffanny29631@users.noreply.github.com>
1 parent 279c3a1 commit 401028b

58 files changed

Lines changed: 17456 additions & 718 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ GO_DIR := $(OUTPUT_DIR)/go
3838

3939
# Base image used for all golang containers
4040
# Uses trusted google-built golang image
41-
GOLANG_IMAGE_VERSION := 1.25.5
41+
GOLANG_IMAGE_VERSION := 1.25.7
4242
GOLANG_IMAGE := google-go.pkg.dev/golang:$(GOLANG_IMAGE_VERSION)
4343
# Base image used for debian containers
4444
# When updating you can use this command:
@@ -77,21 +77,21 @@ GO_JUNIT_REPORT := $(BIN_DIR)/go-junit-report
7777
GOLANGCI_LINT_VERSION := v1.63.4
7878
GOLANGCI_LINT := $(BIN_DIR)/golangci-lint
7979

80-
KUSTOMIZE_VERSION := v5.4.2-gke.1
80+
KUSTOMIZE_VERSION := v5.4.2-gke.4
8181
KUSTOMIZE := $(BIN_DIR)/kustomize
8282
KUSTOMIZE_STAGING_DIR := $(OUTPUT_DIR)/third_party/kustomize
8383

84-
HELM_VERSION := v3.18.6-gke.1
84+
HELM_VERSION := v3.18.6-gke.3
8585
HELM := $(BIN_DIR)/helm
8686
HELM_STAGING_DIR := $(OUTPUT_DIR)/third_party/helm
8787

8888
COSIGN_VERSION := v2.4.1
8989
COSIGN := $(BIN_DIR)/cosign
9090

91-
GIT_SYNC_VERSION := v4.4.2-gke.12__linux_amd64
91+
GIT_SYNC_VERSION := v4.4.2-gke.14__linux_amd64
9292
GIT_SYNC_IMAGE_NAME := gcr.io/config-management-release/git-sync:$(GIT_SYNC_VERSION)
9393

94-
OTELCONTRIBCOL_VERSION := v0.127.0-gke.4
94+
OTELCONTRIBCOL_VERSION := v0.127.0-gke.6
9595
OTELCONTRIBCOL_IMAGE_NAME := gcr.io/config-management-release/otelcontribcol:$(OTELCONTRIBCOL_VERSION)
9696

9797
# Directory used for staging Docker contexts.

‎e2e/nomostest/git-server.go‎

Lines changed: 96 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"github.com/GoogleContainerTools/config-sync/pkg/kinds"
2626
appsv1 "k8s.io/api/apps/v1"
2727
corev1 "k8s.io/api/core/v1"
28+
"k8s.io/apimachinery/pkg/api/resource"
2829
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2930
"k8s.io/apimachinery/pkg/types"
3031
"k8s.io/apimachinery/pkg/util/intstr"
@@ -39,6 +40,14 @@ const testGitHTTPServer = "http-git-server"
3940
const testGitHTTPServerImage = testing.TestInfraArtifactRepositoryAddress + "/http-git-server:v1.0.0-b3b4984cd"
4041
const safeToEvictAnnotation = "cluster-autoscaler.kubernetes.io/safe-to-evict"
4142

43+
// Resource requirements for Autopilot clusters
44+
const (
45+
gitServerCPURequest = "100m"
46+
gitServerMemoryRequest = "128Mi"
47+
httpGitServerCPURequest = "50m"
48+
httpGitServerMemoryRequest = "64Mi"
49+
)
50+
4251
func testGitServerSelector() map[string]string {
4352
// Note that maps are copied by reference into objects.
4453
// If this were just a variable, then concurrent usages by Clients may result
@@ -88,7 +97,7 @@ func setupGit(nt *NT) error {
8897
// The git-server almost always comes up before 40 seconds, but we give it a
8998
// full minute in the callback to be safe.
9099
func installGitServer(nt *NT) error {
91-
objs := gitServer()
100+
objs := gitServer(nt)
92101

93102
for _, o := range objs {
94103
if err := nt.KubeClient.Apply(o); err != nil {
@@ -100,12 +109,12 @@ func installGitServer(nt *NT) error {
100109
return nt.Watcher.WatchForCurrentStatus(kinds.Deployment(), testGitServer, testGitNamespace)
101110
}
102111

103-
func gitServer() []client.Object {
112+
func gitServer(nt *NT) []client.Object {
104113
// Remember that we've already created the git-server's Namespace since the
105114
// SSH key must exist before we apply the Deployment.
106115
objs := []client.Object{
107116
gitService(),
108-
gitDeployment(),
117+
gitDeployment(nt),
109118
}
110119
return objs
111120
}
@@ -125,12 +134,94 @@ func gitService() *corev1.Service {
125134
return service
126135
}
127136

128-
func gitDeployment() *appsv1.Deployment {
137+
func gitDeployment(nt *NT) *appsv1.Deployment {
129138
deployment := k8sobjects.DeploymentObject(core.Name(testGitServer),
130139
core.Namespace(testGitNamespace),
131140
core.Labels(testGitServerSelector()),
132141
)
133142
gitGID := int64(1000)
143+
144+
// Define containers with base configuration
145+
containers := []corev1.Container{
146+
{
147+
Name: testGitServer,
148+
Image: testGitServerImage,
149+
Ports: []corev1.ContainerPort{{ContainerPort: 22}},
150+
VolumeMounts: []corev1.VolumeMount{
151+
{Name: "keys", MountPath: "/git-server/keys"},
152+
{Name: "repos", MountPath: "/git-server/repos"},
153+
},
154+
// Restart the container if 6 probes fail
155+
LivenessProbe: newTCPSocketProbe(22, 6),
156+
// Mark pod as unready if 2 probes fail
157+
ReadinessProbe: newTCPSocketProbe(22, 2),
158+
},
159+
{
160+
Name: testGitHTTPServer,
161+
Image: testGitHTTPServerImage,
162+
Ports: []corev1.ContainerPort{{ContainerPort: 443}},
163+
VolumeMounts: []corev1.VolumeMount{
164+
{Name: "repos", MountPath: "/git-server/repos"},
165+
{Name: "ssl-cert", MountPath: "/etc/nginx/ssl"},
166+
},
167+
// Restart the container if 6 probes fail
168+
LivenessProbe: newTCPSocketProbe(443, 6),
169+
// Mark pod as unready if 2 probes fail
170+
ReadinessProbe: newTCPSocketProbe(443, 2),
171+
},
172+
}
173+
174+
// Configure pod spec
175+
podSpec := corev1.PodSpec{
176+
Volumes: []corev1.Volume{
177+
{Name: "keys", VolumeSource: corev1.VolumeSource{
178+
Secret: &corev1.SecretVolumeSource{SecretName: gitServerSecretName},
179+
}},
180+
{Name: "repos", VolumeSource: corev1.VolumeSource{EmptyDir: nil}},
181+
{Name: "ssl-cert", VolumeSource: corev1.VolumeSource{
182+
Secret: &corev1.SecretVolumeSource{SecretName: privateCertSecretName(GitSyncSource)},
183+
}},
184+
},
185+
Containers: containers,
186+
ImagePullSecrets: []corev1.LocalObjectReference{},
187+
SecurityContext: &corev1.PodSecurityContext{
188+
FSGroup: &gitGID,
189+
},
190+
}
191+
192+
// Add resource requirements and explicit nodeSelector for Autopilot clusters
193+
// Autopilot requires both requests and limits, and they must be equal
194+
// Explicitly set empty nodeSelector to avoid node affinity/selector mismatches
195+
// with Autopilot's optimize-utilization-scheduler
196+
if nt.IsGKEAutopilot {
197+
// Create resource lists for git-server container (requests and limits are equal for Autopilot)
198+
gitServerResources := corev1.ResourceList{
199+
corev1.ResourceCPU: resource.MustParse(gitServerCPURequest),
200+
corev1.ResourceMemory: resource.MustParse(gitServerMemoryRequest),
201+
}
202+
// Set resource requests and limits for git-server container
203+
podSpec.Containers[0].Resources = corev1.ResourceRequirements{
204+
Requests: gitServerResources,
205+
Limits: gitServerResources,
206+
}
207+
208+
// Create resource lists for http-git-server container (requests and limits are equal for Autopilot)
209+
httpGitServerResources := corev1.ResourceList{
210+
corev1.ResourceCPU: resource.MustParse(httpGitServerCPURequest),
211+
corev1.ResourceMemory: resource.MustParse(httpGitServerMemoryRequest),
212+
}
213+
// Set resource requests and limits for http-git-server container
214+
podSpec.Containers[1].Resources = corev1.ResourceRequirements{
215+
Requests: httpGitServerResources,
216+
Limits: httpGitServerResources,
217+
}
218+
219+
// Explicitly set empty nodeSelector to ensure no node affinity/selector constraints
220+
// This prevents Autopilot's optimize-utilization-scheduler from applying implicit constraints
221+
// that could cause "didn't match Pod's node affinity/selector" errors
222+
podSpec.NodeSelector = map[string]string{}
223+
}
224+
134225
deployment.Spec = appsv1.DeploymentSpec{
135226
MinReadySeconds: 2,
136227
Strategy: appsv1.DeploymentStrategy{Type: appsv1.RecreateDeploymentStrategyType},
@@ -142,49 +233,7 @@ func gitDeployment() *appsv1.Deployment {
142233
safeToEvictAnnotation: "false",
143234
},
144235
},
145-
Spec: corev1.PodSpec{
146-
Volumes: []corev1.Volume{
147-
{Name: "keys", VolumeSource: corev1.VolumeSource{
148-
Secret: &corev1.SecretVolumeSource{SecretName: gitServerSecretName},
149-
}},
150-
{Name: "repos", VolumeSource: corev1.VolumeSource{EmptyDir: nil}},
151-
{Name: "ssl-cert", VolumeSource: corev1.VolumeSource{
152-
Secret: &corev1.SecretVolumeSource{SecretName: privateCertSecretName(GitSyncSource)},
153-
}},
154-
},
155-
Containers: []corev1.Container{
156-
{
157-
Name: testGitServer,
158-
Image: testGitServerImage,
159-
Ports: []corev1.ContainerPort{{ContainerPort: 22}},
160-
VolumeMounts: []corev1.VolumeMount{
161-
{Name: "keys", MountPath: "/git-server/keys"},
162-
{Name: "repos", MountPath: "/git-server/repos"},
163-
},
164-
// Restart the container if 6 probes fail
165-
LivenessProbe: newTCPSocketProbe(22, 6),
166-
// Mark pod as unready if 2 probes fail
167-
ReadinessProbe: newTCPSocketProbe(22, 2),
168-
},
169-
{
170-
Name: testGitHTTPServer,
171-
Image: testGitHTTPServerImage,
172-
Ports: []corev1.ContainerPort{{ContainerPort: 443}},
173-
VolumeMounts: []corev1.VolumeMount{
174-
{Name: "repos", MountPath: "/git-server/repos"},
175-
{Name: "ssl-cert", MountPath: "/etc/nginx/ssl"},
176-
},
177-
// Restart the container if 6 probes fail
178-
LivenessProbe: newTCPSocketProbe(443, 6),
179-
// Mark pod as unready if 2 probes fail
180-
ReadinessProbe: newTCPSocketProbe(443, 2),
181-
},
182-
},
183-
ImagePullSecrets: []corev1.LocalObjectReference{},
184-
SecurityContext: &corev1.PodSecurityContext{
185-
FSGroup: &gitGID,
186-
},
187-
},
236+
Spec: podSpec,
188237
},
189238
}
190239
return deployment

‎go.mod‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/GoogleContainerTools/config-sync
22

3-
go 1.25.5
3+
go 1.25.7
44

55
require (
66
cloud.google.com/go/auth v0.18.1
@@ -32,16 +32,16 @@ require (
3232
github.com/spf13/cobra v1.10.2
3333
github.com/spyzhov/ajson v0.9.6
3434
github.com/stretchr/testify v1.11.1
35-
go.opentelemetry.io/otel v1.39.0
36-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0
37-
go.opentelemetry.io/otel/metric v1.39.0
38-
go.opentelemetry.io/otel/sdk v1.39.0
39-
go.opentelemetry.io/otel/sdk/metric v1.39.0
35+
go.opentelemetry.io/otel v1.40.0
36+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.40.0
37+
go.opentelemetry.io/otel/metric v1.40.0
38+
go.opentelemetry.io/otel/sdk v1.40.0
39+
go.opentelemetry.io/otel/sdk/metric v1.40.0
4040
go.uber.org/multierr v1.11.0
4141
go.uber.org/zap v1.27.1
4242
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
4343
golang.org/x/mod v0.32.0
44-
google.golang.org/api v0.264.0
44+
google.golang.org/api v0.265.0
4545
gopkg.in/yaml.v3 v3.0.1
4646
k8s.io/api v0.35.0
4747
k8s.io/apiextensions-apiserver v0.35.0
@@ -110,7 +110,7 @@ require (
110110
github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect
111111
github.com/googleapis/gax-go/v2 v2.16.0 // indirect
112112
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
113-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
113+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
114114
github.com/inconshreveable/mousetrap v1.1.0 // indirect
115115
github.com/jonboulle/clockwork v0.5.0 // indirect
116116
github.com/josharian/intern v1.0.0 // indirect
@@ -150,7 +150,7 @@ require (
150150
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
151151
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
152152
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
153-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
153+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
154154
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
155155
go.uber.org/atomic v1.11.0 // indirect
156156
go.yaml.in/yaml/v2 v2.4.3 // indirect
@@ -166,8 +166,8 @@ require (
166166
golang.org/x/tools v0.40.0 // indirect
167167
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
168168
google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217 // indirect
169-
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
170-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260122232226-8e98ce8d340d // indirect
169+
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
170+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
171171
google.golang.org/grpc v1.78.0 // indirect
172172
google.golang.org/protobuf v1.36.11 // indirect
173173
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect

‎go.sum‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ github.com/googleapis/gax-go/v2 v2.16.0 h1:iHbQmKLLZrexmb0OSsNGTeSTS0HO4YvFOG8g5
192192
github.com/googleapis/gax-go/v2 v2.16.0/go.mod h1:o1vfQjjNZn4+dPnRdl/4ZD7S9414Y4xA+a/6Icj6l14=
193193
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
194194
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
195-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 h1:NmZ1PKzSTQbuGHw9DGPFomqkkLWMC+vZCkfs+FHv1Vg=
196-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3/go.mod h1:zQrxl1YP88HQlA6i9c63DSVPFklWpGX4OWAc9bFuaH4=
195+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 h1:X+2YciYSxvMQK0UZ7sg45ZVabVZBeBuvMkmuI2V3Fak=
196+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7/go.mod h1:lW34nIZuQ8UDPdkon5fmfp2l3+ZkQ2me/+oecHYLOII=
197197
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
198198
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
199199
github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=
@@ -337,18 +337,18 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6
337337
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo=
338338
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
339339
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
340-
go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
341-
go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
342-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0 h1:cEf8jF6WbuGQWUVcqgyWtTR0kOOAWY1DYZ+UhvdmQPw=
343-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0/go.mod h1:k1lzV5n5U3HkGvTCJHraTAGJ7MqsgL1wrGwTj1Isfiw=
344-
go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
345-
go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
346-
go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
347-
go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
348-
go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
349-
go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
350-
go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
351-
go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
340+
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
341+
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
342+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.40.0 h1:NOyNnS19BF2SUDApbOKbDtWZ0IK7b8FJ2uAGdIWOGb0=
343+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.40.0/go.mod h1:VL6EgVikRLcJa9ftukrHu/ZkkhFBSo1lzvdBC9CF1ss=
344+
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
345+
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
346+
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
347+
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
348+
go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
349+
go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
350+
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
351+
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
352352
go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A=
353353
go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4=
354354
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
@@ -426,19 +426,19 @@ gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw
426426
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
427427
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
428428
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
429-
google.golang.org/api v0.264.0 h1:+Fo3DQXBK8gLdf8rFZ3uLu39JpOnhvzJrLMQSoSYZJM=
430-
google.golang.org/api v0.264.0/go.mod h1:fAU1xtNNisHgOF5JooAs8rRaTkl2rT3uaoNGo9NS3R8=
429+
google.golang.org/api v0.265.0 h1:FZvfUdI8nfmuNrE34aOWFPmLC+qRBEiNm3JdivTvAAU=
430+
google.golang.org/api v0.265.0/go.mod h1:uAvfEl3SLUj/7n6k+lJutcswVojHPp2Sp08jWCu8hLY=
431431
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
432432
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
433433
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
434434
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
435435
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
436436
google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217 h1:GvESR9BIyHUahIb0NcTum6itIWtdoglGX+rnGxm2934=
437437
google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:yJ2HH4EHEDTd3JiLmhds6NkJ17ITVYOdV3m3VKOnws0=
438-
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 h1:fCvbg86sFXwdrl5LgVcTEvNC+2txB5mgROGmRL5mrls=
439-
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto=
440-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260122232226-8e98ce8d340d h1:xXzuihhT3gL/ntduUZwHECzAn57E8dA6l8SOtYWdD8Q=
441-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260122232226-8e98ce8d340d/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
438+
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 h1:merA0rdPeUV3YIIfHHcH4qBkiQAc1nfCKSI7lB4cV2M=
439+
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409/go.mod h1:fl8J1IvUjCilwZzQowmw2b7HQB2eAuYBabMXzWurF+I=
440+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 h1:H86B94AW+VfJWDqFeEbBPhEtHzJwJfTbgE2lZa54ZAQ=
441+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
442442
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
443443
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
444444
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=

‎pkg/hydrate/tool_util.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ import (
4444

4545
const (
4646
// HelmVersion is the recommended version of Helm for hydration.
47-
HelmVersion = "v3.18.6-gke.1"
47+
HelmVersion = "v3.18.6-gke.3"
4848
// KustomizeVersion is the recommended version of Kustomize for hydration.
49-
KustomizeVersion = "v5.4.2-gke.1"
49+
KustomizeVersion = "v5.4.2-gke.4"
5050
// Helm is the binary name of the installed Helm.
5151
Helm = "helm"
5252
// Kustomize is the binary name of the installed Kustomize.

‎vendor/go.opentelemetry.io/otel/.golangci.yml‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)