Skip to content

Commit 941f6b0

Browse files
isometryisometry
committed
chore(deps): bump all and update operator-sdk scaffold to v1.39.0
1 parent b75267c commit 941f6b0

File tree

8 files changed

+248
-181
lines changed

8 files changed

+248
-181
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ build-installer: manifests generate kustomize ## Generate a consolidated YAML wi
189189
ko-build: ## Build the manager image using ko.
190190
KO_DOCKER_REPO=$(IMAGE_TAG_BASE) \
191191
ko build --bare --platform=$(PLATFORMS) --image-label org.opencontainers.image.source=$(IMAGE_SOURCE) --tags "latest,$(VERSION)" --push ./cmd/manager
192-
192+
193193

194194
##@ Deployment
195195

@@ -231,7 +231,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
231231
## Tool Versions
232232
KUSTOMIZE_VERSION ?= v5.5.0
233233
CONTROLLER_TOOLS_VERSION ?= v0.16.4
234-
ENVTEST_VERSION ?= release-0.18
234+
ENVTEST_VERSION ?= release-0.19
235235
GOLANGCI_LINT_VERSION ?= v1.59.1
236236

237237
.PHONY: kustomize

‎cmd/manager/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func main() {
9191

9292
// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.
9393
// More info:
94-
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.18.4/pkg/metrics/server
94+
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.19.0/pkg/metrics/server
9595
// - https://book.kubebuilder.io/reference/metrics.html
9696
metricsServerOptions := metricsserver.Options{
9797
BindAddress: metricsAddr,
@@ -109,7 +109,7 @@ func main() {
109109
// FilterProvider is used to protect the metrics endpoint with authn/authz.
110110
// These configurations ensure that only authorized users and service accounts
111111
// can access the metrics endpoint. The RBAC are configured in 'config/rbac/kustomization.yaml'. More info:
112-
// https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.18.4/pkg/metrics/filters#WithAuthenticationAndAuthorization
112+
// https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.19.0/pkg/metrics/filters#WithAuthenticationAndAuthorization
113113
metricsServerOptions.FilterProvider = filters.WithAuthenticationAndAuthorization
114114
}
115115

‎config/default/kustomization.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,9 @@ patches:
143143
# delimiter: '.'
144144
# index: 1
145145
# create: true
146+
147+
# [NETWORK POLICY] Protect the /metrics endpoint and Webhook Server with NetworkPolicy.
148+
# Only Pod(s) running a namespace labeled with 'metrics: enabled' will be able to gather the metrics.
149+
# Only CR(s) which requires webhooks and are applied on namespaces labeled with 'webhooks: enabled' will
150+
# be able to communicate with the Webhook Server.
151+
#- ../network-policy

‎config/network-policy/allow-metrics-traffic.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# This NetworkPolicy allows ingress traffic
2+
# with Pods running on namespaces labeled with 'metrics: enabled'. Only Pods on those
3+
# namespaces are able to gathering data from the metrics endpoint.
4+
apiVersion: networking.k8s.io/v1
5+
kind: NetworkPolicy
6+
metadata:
7+
labels:
8+
app.kubernetes.io/name: github-token-manager
9+
app.kubernetes.io/managed-by: kustomize
10+
name: allow-metrics-traffic
11+
namespace: system
12+
spec:
13+
podSelector:
14+
matchLabels:
15+
control-plane: controller-manager
16+
policyTypes:
17+
- Ingress
18+
ingress:
19+
# This allows ingress traffic from any namespace with the label metrics: enabled
20+
- from:
21+
- namespaceSelector:
22+
matchLabels:
23+
metrics: enabled # Only from namespaces with this label
24+
ports:
25+
- port: 8443
26+
protocol: TCP

‎config/network-policy/allow-webhook-traffic.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# This NetworkPolicy allows ingress traffic to your webhook server running
2+
# as part of the controller-manager from specific namespaces and pods. CR(s) which uses webhooks
3+
# will only work when applied in namespaces labeled with 'webhook: enabled'
4+
apiVersion: networking.k8s.io/v1
5+
kind: NetworkPolicy
6+
metadata:
7+
labels:
8+
app.kubernetes.io/name: memcached-operator
9+
app.kubernetes.io/managed-by: kustomize
10+
name: allow-webhook-traffic
11+
namespace: system
12+
spec:
13+
podSelector:
14+
matchLabels:
15+
control-plane: controller-manager
16+
policyTypes:
17+
- Ingress
18+
ingress:
19+
# This allows ingress traffic from any namespace with the label webhook: enabled
20+
- from:
21+
- namespaceSelector:
22+
matchLabels:
23+
webhook: enabled # Only from namespaces with this label
24+
ports:
25+
- port: 443
26+
protocol: TCP

‎config/network-policy/kustomization.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resources:
2+
- allow-webhook-traffic.yaml
3+
- allow-metrics-traffic.yaml

‎go.mod‎

Lines changed: 61 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,40 @@ require (
99
github.com/onsi/ginkgo/v2 v2.22.2
1010
github.com/onsi/gomega v1.36.2
1111
github.com/spf13/viper v1.19.0
12-
k8s.io/api v0.32.0
13-
k8s.io/apimachinery v0.32.0
14-
k8s.io/client-go v0.32.0
15-
sigs.k8s.io/controller-runtime v0.19.4
12+
k8s.io/api v0.32.1
13+
k8s.io/apimachinery v0.32.1
14+
k8s.io/client-go v0.32.1
15+
sigs.k8s.io/controller-runtime v0.20.0
1616
)
1717

1818
require (
1919
cel.dev/expr v0.19.1 // indirect
20-
cloud.google.com/go v0.116.0 // indirect
21-
cloud.google.com/go/auth v0.12.1 // indirect
22-
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
23-
cloud.google.com/go/compute/metadata v0.5.2 // indirect
24-
cloud.google.com/go/iam v1.3.0 // indirect
25-
cloud.google.com/go/kms v1.20.2 // indirect
26-
cloud.google.com/go/longrunning v0.6.3 // indirect
20+
cloud.google.com/go v0.118.0 // indirect
21+
cloud.google.com/go/auth v0.14.0 // indirect
22+
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
23+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
24+
cloud.google.com/go/iam v1.3.1 // indirect
25+
cloud.google.com/go/kms v1.20.5 // indirect
26+
cloud.google.com/go/longrunning v0.6.4 // indirect
2727
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2828
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
29-
github.com/aws/aws-sdk-go-v2 v1.32.6 // indirect
30-
github.com/aws/aws-sdk-go-v2/config v1.28.6 // indirect
31-
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect
32-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
33-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
34-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
29+
github.com/aws/aws-sdk-go-v2 v1.33.0 // indirect
30+
github.com/aws/aws-sdk-go-v2/config v1.29.1 // indirect
31+
github.com/aws/aws-sdk-go-v2/credentials v1.17.54 // indirect
32+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.24 // indirect
33+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.28 // indirect
34+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 // indirect
3535
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
3636
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
37-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
38-
github.com/aws/aws-sdk-go-v2/service/kms v1.37.7 // indirect
39-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
40-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
41-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
37+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.9 // indirect
38+
github.com/aws/aws-sdk-go-v2/service/kms v1.37.13 // indirect
39+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.11 // indirect
40+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.10 // indirect
41+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.9 // indirect
4242
github.com/aws/smithy-go v1.22.1 // indirect
4343
github.com/beorn7/perks v1.0.1 // indirect
4444
github.com/blang/semver/v4 v4.0.0 // indirect
45-
github.com/bradleyfalzon/ghinstallation/v2 v2.12.0 // indirect
45+
github.com/bradleyfalzon/ghinstallation/v2 v2.13.0 // indirect
4646
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4747
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4848
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -61,23 +61,25 @@ require (
6161
github.com/gogo/protobuf v1.3.2 // indirect
6262
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
6363
github.com/golang/protobuf v1.5.4 // indirect
64+
github.com/google/btree v1.1.3 // indirect
6465
github.com/google/cel-go v0.22.1 // indirect
6566
github.com/google/gnostic-models v0.6.9 // indirect
6667
github.com/google/go-cmp v0.6.0 // indirect
68+
github.com/google/go-github/v68 v68.0.0 // indirect
6769
github.com/google/go-querystring v1.1.0 // indirect
6870
github.com/google/gofuzz v1.2.0 // indirect
6971
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
70-
github.com/google/s2a-go v0.1.8 // indirect
72+
github.com/google/s2a-go v0.1.9 // indirect
7173
github.com/google/uuid v1.6.0 // indirect
7274
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
73-
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
74-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
75+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
76+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
7577
github.com/hashicorp/errwrap v1.1.0 // indirect
7678
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
7779
github.com/hashicorp/go-multierror v1.1.1 // indirect
7880
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
7981
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
80-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
82+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.9 // indirect
8183
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
8284
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
8385
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -87,7 +89,7 @@ require (
8789
github.com/json-iterator/go v1.1.12 // indirect
8890
github.com/klauspost/compress v1.17.11 // indirect
8991
github.com/magiconair/properties v1.8.9 // indirect
90-
github.com/mailru/easyjson v0.7.7 // indirect
92+
github.com/mailru/easyjson v0.9.0 // indirect
9193
github.com/mitchellh/go-homedir v1.1.0 // indirect
9294
github.com/mitchellh/mapstructure v1.5.0 // indirect
9395
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -97,57 +99,57 @@ require (
9799
github.com/pkg/errors v0.9.1 // indirect
98100
github.com/prometheus/client_golang v1.20.5 // indirect
99101
github.com/prometheus/client_model v0.6.1 // indirect
100-
github.com/prometheus/common v0.61.0 // indirect
102+
github.com/prometheus/common v0.62.0 // indirect
101103
github.com/prometheus/procfs v0.15.1 // indirect
102104
github.com/ryanuber/go-glob v1.0.0 // indirect
103-
github.com/sagikazarmark/locafero v0.6.0 // indirect
105+
github.com/sagikazarmark/locafero v0.7.0 // indirect
104106
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
105107
github.com/sourcegraph/conc v0.3.0 // indirect
106-
github.com/spf13/afero v1.11.0 // indirect
107-
github.com/spf13/cast v1.7.0 // indirect
108+
github.com/spf13/afero v1.12.0 // indirect
109+
github.com/spf13/cast v1.7.1 // indirect
108110
github.com/spf13/cobra v1.8.1 // indirect
109111
github.com/spf13/pflag v1.0.5 // indirect
110112
github.com/stoewer/go-strcase v1.3.0 // indirect
111113
github.com/subosito/gotenv v1.6.0 // indirect
112114
github.com/x448/float16 v0.8.4 // indirect
113115
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
114-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
115-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
116-
go.opentelemetry.io/otel v1.33.0 // indirect
117-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
118-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
119-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
120-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
121-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
122-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
116+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
117+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
118+
go.opentelemetry.io/otel v1.34.0 // indirect
119+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
120+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
121+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
122+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
123+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
124+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
123125
go.uber.org/multierr v1.11.0 // indirect
124126
go.uber.org/zap v1.27.0 // indirect
125-
golang.org/x/crypto v0.31.0 // indirect
126-
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
127-
golang.org/x/net v0.33.0 // indirect
128-
golang.org/x/oauth2 v0.24.0 // indirect
127+
golang.org/x/crypto v0.32.0 // indirect
128+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
129+
golang.org/x/net v0.34.0 // indirect
130+
golang.org/x/oauth2 v0.25.0 // indirect
129131
golang.org/x/sync v0.10.0 // indirect
130-
golang.org/x/sys v0.28.0 // indirect
131-
golang.org/x/term v0.27.0 // indirect
132+
golang.org/x/sys v0.29.0 // indirect
133+
golang.org/x/term v0.28.0 // indirect
132134
golang.org/x/text v0.21.0 // indirect
133-
golang.org/x/time v0.8.0 // indirect
134-
golang.org/x/tools v0.28.0 // indirect
135+
golang.org/x/time v0.9.0 // indirect
136+
golang.org/x/tools v0.29.0 // indirect
135137
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
136-
google.golang.org/api v0.211.0 // indirect
137-
google.golang.org/genproto v0.0.0-20241209162323-e6fa225c2576 // indirect
138-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
139-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
140-
google.golang.org/grpc v1.69.0 // indirect
141-
google.golang.org/protobuf v1.36.1 // indirect
138+
google.golang.org/api v0.217.0 // indirect
139+
google.golang.org/genproto v0.0.0-20250115164207-1a7da9e5054f // indirect
140+
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
141+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
142+
google.golang.org/grpc v1.69.4 // indirect
143+
google.golang.org/protobuf v1.36.3 // indirect
142144
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
143145
gopkg.in/inf.v0 v0.9.1 // indirect
144146
gopkg.in/ini.v1 v1.67.0 // indirect
145147
gopkg.in/yaml.v3 v3.0.1 // indirect
146-
k8s.io/apiextensions-apiserver v0.32.0 // indirect
147-
k8s.io/apiserver v0.32.0 // indirect
148-
k8s.io/component-base v0.32.0 // indirect
148+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
149+
k8s.io/apiserver v0.32.1 // indirect
150+
k8s.io/component-base v0.32.1 // indirect
149151
k8s.io/klog/v2 v2.130.1 // indirect
150-
k8s.io/kube-openapi v0.0.0-20241212045625-5ad02ce6640f // indirect
152+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
151153
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
152154
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
153155
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

0 commit comments

Comments
 (0)