Skip to content

Commit b46d0b4

Browse files
linkilinki
authored
Merge pull request #490 from zalando-incubator/kube-1.33
update kubernetes to 1.33 and go to go1.25.1
2 parents f34ded8 + a55cd86 commit b46d0b4

File tree

13 files changed

+116
-89
lines changed

13 files changed

+116
-89
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
- uses: actions/checkout@v4
88
- uses: actions/setup-go@v5
99
with:
10-
go-version: '^1.24'
10+
go-version: '^1.25'
1111
- run: go version
1212
- run: go install github.com/mattn/goveralls@latest
1313
- run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
BINARY ?= es-operator
44
VERSION ?= $(shell git describe --tags --always --dirty)
5-
IMAGE ?= registry-write.opensource.zalan.do/poirot/$(BINARY)
5+
IMAGE ?= registry-write.opensource.zalan.do/pandora/$(BINARY)
66
E2E_IMAGE ?= $(IMAGE)-e2e
77
TAG ?= $(VERSION)
88
SOURCES = $(shell find . -name '*.go')

‎delivery.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ pipeline:
1919
- desc: push
2020
cmd: |
2121
if [[ $CDP_TARGET_BRANCH == master && ! $CDP_PULL_REQUEST_NUMBER ]]; then
22-
IMAGE=registry-write.opensource.zalan.do/poirot/es-operator
22+
IMAGE=registry-write.opensource.zalan.do/pandora/es-operator
2323
VERSION=$(git describe --tags --always --dirty)
2424
else
25-
IMAGE=registry-write.opensource.zalan.do/poirot/es-operator-test
25+
IMAGE=registry-write.opensource.zalan.do/pandora/es-operator-test
2626
VERSION=$CDP_BUILD_VERSION
2727
fi
2828
IMAGE=$IMAGE VERSION=$VERSION make build.push
@@ -42,7 +42,7 @@ pipeline:
4242
- name: DEPLOYMENT_PATH
4343
value: deploy/e2e
4444
- name: IMAGE
45-
value: "registry.opensource.zalan.do/poirot/es-operator-test:#{CDP_BUILD_VERSION}"
45+
value: "registry.opensource.zalan.do/pandora/es-operator-test:#{CDP_BUILD_VERSION}"
4646
- name: OPERATOR_ID
4747
value: "#{CDP_BUILD_VERSION}"
4848
end2end_tests:
@@ -53,7 +53,7 @@ pipeline:
5353
restartPolicy: Never
5454
containers:
5555
- name: e2e
56-
image: "registry.opensource.zalan.do/poirot/es-operator-test-e2e:#{CDP_BUILD_VERSION}"
56+
image: "registry.opensource.zalan.do/pandora/es-operator-test-e2e:#{CDP_BUILD_VERSION}"
5757
command: ["/e2e"]
5858
env:
5959
- name: "OPERATOR_ID"

‎docs/RELEASING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# How to release
22

3-
ES-Operator is released as docker image to Zalando's public Docker repository `registry.opensource.zalan.do`. Every merge to master generates a new Docker image, you could go with `registry.opensource.zalan.do/poirot/es-operator:latest` for the latest and greatest version.
3+
ES-Operator is released as docker image to Zalando's public Docker repository `registry.opensource.zalan.do`. Every merge to master generates a new Docker image, you could go with `registry.opensource.zalan.do/pandora/es-operator:latest` for the latest and greatest version.
44

55
When introducing bigger changes, we create tags and write release notes. The release process itself is triggered via the Zalando-internal CI/CD tool.
66

‎docs/es-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
serviceAccountName: es-operator
3434
containers:
3535
- name: es-operator
36-
image: registry.opensource.zalan.do/poirot/es-operator:latest
36+
image: registry.opensource.zalan.do/pandora/es-operator:latest
3737
resources:
3838
limits:
3939
cpu: 20m

‎docs/zalando.org_elasticsearchdatasets.yaml‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ spec:
508508
pod labels will be ignored. The default value is empty.
509509
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
510510
Also, matchLabelKeys cannot be set when labelSelector isn't set.
511-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
512511
items:
513512
type: string
514513
type: array
@@ -523,7 +522,6 @@ spec:
523522
pod labels will be ignored. The default value is empty.
524523
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
525524
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
526-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
527525
items:
528526
type: string
529527
type: array
@@ -750,7 +748,6 @@ spec:
750748
pod labels will be ignored. The default value is empty.
751749
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
752750
Also, matchLabelKeys cannot be set when labelSelector isn't set.
753-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
754751
items:
755752
type: string
756753
type: array
@@ -765,7 +762,6 @@ spec:
765762
pod labels will be ignored. The default value is empty.
766763
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
767764
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
768-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
769765
items:
770766
type: string
771767
type: array
@@ -976,7 +972,7 @@ spec:
976972
Cannot be updated.
977973
items:
978974
description: EnvFromSource represents the source of
979-
a set of ConfigMaps
975+
a set of ConfigMaps or Secrets
980976
properties:
981977
configMapRef:
982978
description: The ConfigMap to select from
@@ -997,8 +993,8 @@ spec:
997993
type: object
998994
x-kubernetes-map-type: atomic
999995
prefix:
1000-
description: An optional identifier to prepend
1001-
to each key in the ConfigMap. Must be a C_IDENTIFIER.
996+
description: Optional text to prepend to the name
997+
of each environment variable. Must be a C_IDENTIFIER.
1002998
type: string
1003999
secretRef:
10041000
description: The Secret to select from
@@ -1196,6 +1192,12 @@ spec:
11961192
- port
11971193
type: object
11981194
type: object
1195+
stopSignal:
1196+
description: |-
1197+
StopSignal defines which signal will be sent to a container when it is being stopped.
1198+
If not specified, the default is defined by the container runtime in use.
1199+
StopSignal can only be set for Pods with a non-empty .spec.os.name
1200+
type: string
11991201
type: object
12001202
livenessProbe:
12011203
description: |-
@@ -2379,7 +2381,7 @@ spec:
23792381
Cannot be updated.
23802382
items:
23812383
description: EnvFromSource represents the source of
2382-
a set of ConfigMaps
2384+
a set of ConfigMaps or Secrets
23832385
properties:
23842386
configMapRef:
23852387
description: The ConfigMap to select from
@@ -2400,8 +2402,8 @@ spec:
24002402
type: object
24012403
x-kubernetes-map-type: atomic
24022404
prefix:
2403-
description: An optional identifier to prepend
2404-
to each key in the ConfigMap. Must be a C_IDENTIFIER.
2405+
description: Optional text to prepend to the name
2406+
of each environment variable. Must be a C_IDENTIFIER.
24052407
type: string
24062408
secretRef:
24072409
description: The Secret to select from
@@ -2596,6 +2598,12 @@ spec:
25962598
- port
25972599
type: object
25982600
type: object
2601+
stopSignal:
2602+
description: |-
2603+
StopSignal defines which signal will be sent to a container when it is being stopped.
2604+
If not specified, the default is defined by the container runtime in use.
2605+
StopSignal can only be set for Pods with a non-empty .spec.os.name
2606+
type: string
25992607
type: object
26002608
livenessProbe:
26012609
description: Probes are not allowed for ephemeral containers.
@@ -3631,7 +3639,7 @@ spec:
36313639
Init containers may not have Lifecycle actions, Readiness probes, Liveness probes, or Startup probes.
36323640
The resourceRequirements of an init container are taken into account during scheduling
36333641
by finding the highest request/limit for each resource type, and then using the max of
3634-
of that value or the sum of the normal containers. Limits are applied to init containers
3642+
that value or the sum of the normal containers. Limits are applied to init containers
36353643
in a similar fashion.
36363644
Init containers cannot currently be added or removed.
36373645
Cannot be updated.
@@ -3775,7 +3783,7 @@ spec:
37753783
Cannot be updated.
37763784
items:
37773785
description: EnvFromSource represents the source of
3778-
a set of ConfigMaps
3786+
a set of ConfigMaps or Secrets
37793787
properties:
37803788
configMapRef:
37813789
description: The ConfigMap to select from
@@ -3796,8 +3804,8 @@ spec:
37963804
type: object
37973805
x-kubernetes-map-type: atomic
37983806
prefix:
3799-
description: An optional identifier to prepend
3800-
to each key in the ConfigMap. Must be a C_IDENTIFIER.
3807+
description: Optional text to prepend to the name
3808+
of each environment variable. Must be a C_IDENTIFIER.
38013809
type: string
38023810
secretRef:
38033811
description: The Secret to select from
@@ -3995,6 +4003,12 @@ spec:
39954003
- port
39964004
type: object
39974005
type: object
4006+
stopSignal:
4007+
description: |-
4008+
StopSignal defines which signal will be sent to a container when it is being stopped.
4009+
If not specified, the default is defined by the container runtime in use.
4010+
StopSignal can only be set for Pods with a non-empty .spec.os.name
4011+
type: string
39984012
type: object
39994013
livenessProbe:
40004014
description: |-
@@ -5697,7 +5711,6 @@ spec:
56975711
- Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
56985712
56995713
If this value is nil, the behavior is equivalent to the Honor policy.
5700-
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
57015714
type: string
57025715
nodeTaintsPolicy:
57035716
description: |-
@@ -5708,7 +5721,6 @@ spec:
57085721
- Ignore: node taints are ignored. All nodes are included.
57095722
57105723
If this value is nil, the behavior is equivalent to the Ignore policy.
5711-
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
57125724
type: string
57135725
topologyKey:
57145726
description: |-
@@ -5991,13 +6003,6 @@ spec:
59916003
description: key is the key to project.
59926004
type: string
59936005
mode:
5994-
description: |-
5995-
mode is Optional: mode bits used to set permissions on this file.
5996-
Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
5997-
YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
5998-
If not specified, the volume defaultMode will be used.
5999-
This might be in conflict with other options that affect the file
6000-
mode, like fsGroup, and the result can be other mode bits set.
60016006
format: int32
60026007
type: integer
60036008
path:
@@ -6562,7 +6567,7 @@ spec:
65626567
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
65636568
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
65646569
The volume will be mounted read-only (ro) and non-executable files (noexec).
6565-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
6570+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
65666571
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
65676572
properties:
65686573
pullPolicy:

‎e2e.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# script.
77

88
NAMESPACE="${NAMESPACE:-"es-operator-e2e-$(date +%s)"}"
9-
IMAGE="${IMAGE:-"registry.opensource.zalan.do/poirot/es-operator:latest"}"
9+
IMAGE="${IMAGE:-"registry.opensource.zalan.do/pandora/es-operator:latest"}"
1010
SERVICE_ENDPOINT_ES8="${SERVICE_ENDPOINT_ES8:-"http://127.0.0.1:8001/api/v1/namespaces/$NAMESPACE/services/es8-master:9200/proxy"}"
1111
SERVICE_ENDPOINT_ES7="${SERVICE_ENDPOINT_ES7:-"http://127.0.0.1:8001/api/v1/namespaces/$NAMESPACE/services/es7-master:9200/proxy"}"
1212
OPERATOR_ID="${OPERATOR_ID:-"e2e-tests"}"

‎go.mod‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ require (
88
github.com/prometheus/client_golang v1.22.0
99
github.com/sirupsen/logrus v1.9.3
1010
github.com/stretchr/testify v1.10.0
11-
k8s.io/api v0.32.5
12-
k8s.io/apimachinery v0.32.5
13-
k8s.io/client-go v0.32.5
14-
k8s.io/code-generator v0.32.5
15-
k8s.io/metrics v0.32.5
11+
k8s.io/api v0.33.5
12+
k8s.io/apimachinery v0.33.5
13+
k8s.io/client-go v0.33.5
14+
k8s.io/code-generator v0.33.5
15+
k8s.io/metrics v0.33.5
1616
sigs.k8s.io/controller-tools v0.16.1
1717
sigs.k8s.io/yaml v1.4.0
1818
)
@@ -31,10 +31,8 @@ require (
3131
github.com/go-openapi/swag v0.23.0 // indirect
3232
github.com/gobuffalo/flect v1.0.2 // indirect
3333
github.com/gogo/protobuf v1.3.2 // indirect
34-
github.com/golang/protobuf v1.5.4 // indirect
35-
github.com/google/gnostic-models v0.6.8 // indirect
34+
github.com/google/gnostic-models v0.6.9 // indirect
3635
github.com/google/go-cmp v0.7.0 // indirect
37-
github.com/google/gofuzz v1.2.0 // indirect
3836
github.com/google/uuid v1.6.0 // indirect
3937
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4038
github.com/josharian/intern v1.0.0 // indirect
@@ -56,27 +54,28 @@ require (
5654
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
5755
golang.org/x/mod v0.21.0 // indirect
5856
golang.org/x/net v0.40.0 // indirect
59-
golang.org/x/oauth2 v0.24.0 // indirect
57+
golang.org/x/oauth2 v0.27.0 // indirect
6058
golang.org/x/sync v0.14.0 // indirect
6159
golang.org/x/sys v0.33.0 // indirect
6260
golang.org/x/term v0.32.0 // indirect
6361
golang.org/x/text v0.25.0 // indirect
64-
golang.org/x/time v0.7.0 // indirect
62+
golang.org/x/time v0.9.0 // indirect
6563
golang.org/x/tools v0.26.0 // indirect
6664
google.golang.org/protobuf v1.36.5 // indirect
6765
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6866
gopkg.in/inf.v0 v0.9.1 // indirect
6967
gopkg.in/yaml.v2 v2.4.0 // indirect
7068
gopkg.in/yaml.v3 v3.0.1 // indirect
7169
k8s.io/apiextensions-apiserver v0.31.0 // indirect
72-
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
70+
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
7371
k8s.io/klog/v2 v2.130.1 // indirect
74-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
72+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
7573
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
7674
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
77-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
75+
sigs.k8s.io/randfill v1.0.0 // indirect
76+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
7877
)
7978

8079
replace k8s.io/klog => github.com/mikkeloscar/knolog v0.0.0-20190326191552-80742771eb6b
8180

82-
go 1.24
81+
go 1.25.1

0 commit comments

Comments
 (0)