Skip to content

Commit 2031974

Browse files
alexandrevilainalexandrevilain
authored
Merge pull request #955 from samm-git/upgrade-temporal-version
Add support for the temporal versions up to 1.28.x
2 parents 0947c63 + 188c21c commit 2031974

File tree

10 files changed

+336
-225
lines changed

10 files changed

+336
-225
lines changed

‎.github/workflows/e2e.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ defaults:
1111
shell: bash
1212

1313
env:
14-
KIND_VERSION: v0.24.0
14+
KIND_VERSION: v0.29.0
1515
OPERATOR_IMAGE_PATH: /tmp/temporal-operator.tar
1616

1717
jobs:
@@ -21,16 +21,14 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
kube-version:
24-
- tag: v1.27.16
25-
kind-image: kindest/node:v1.27.17@sha256:3fd82731af34efe19cd54ea5c25e882985bafa2c9baefe14f8deab1737d9fabe
26-
- tag: v1.28.13
27-
kind-image: kindest/node:v1.28.13@sha256:45d319897776e11167e4698f6b14938eb4d52eb381d9e3d7a9086c16c69a8110
28-
- tag: v1.29.8
29-
kind-image: kindest/node:v1.29.8@sha256:d46b7aa29567e93b27f7531d258c372e829d7224b25e3fc6ffdefed12476d3aa
30-
- tag: v1.30.4
31-
kind-image: kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114
32-
- tag: v1.31.0
33-
kind-image: kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865
24+
- tag: v1.30.13
25+
kind-image: kindest/node:v1.30.13@sha256:397209b3d947d154f6641f2d0ce8d473732bd91c87d9575ade99049aa33cd648
26+
- tag: v1.31.9
27+
kind-image: kindest/node:v1.31.9@sha256:b94a3a6c06198d17f59cca8c6f486236fa05e2fb359cbd75dabbfc348a10b211
28+
- tag: v1.32.5
29+
kind-image: kindest/node:v1.32.5@sha256:e3b2327e3a5ab8c76f5ece68936e4cafaa82edf58486b769727ab0b3b97a5b0d
30+
- tag: v1.33.1
31+
kind-image: kindest/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f
3432
name: Run generate E2E tests
3533
steps:
3634
- name: Checkout

‎.github/workflows/tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ defaults:
1111
shell: bash
1212

1313
env:
14-
GOLANG_CI_VERSION: v1.61.0
14+
GOLANG_CI_VERSION: v1.64.8
1515

1616
jobs:
1717
license:
@@ -55,4 +55,4 @@ jobs:
5555
go-version-file: 'go.mod'
5656
check-latest: true
5757
- name: test
58-
run: make test
58+
run: make test

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=${BUILDPLATFORM} golang:1.23.1 AS builder
2+
FROM --platform=${BUILDPLATFORM} golang:1.24.6 AS builder
33

44
ARG TARGETPLATFORM
55
ARG BUILDPLATFORM

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ OPERATOR_SDK_VERSION ?= 1.37.0
219219
CONTROLLER_TOOLS_VERSION ?= v0.16.3
220220
GO_LICENSER_VERSION ?= v0.4.0
221221
GEN_CRD_API_REFERENCE_DOCS_VERSION ?= 3f29e6853552dcf08a8e846b1225f275ed0f3e3b
222-
GOLANGCI_LINT_VERSION ?= v1.61.0
222+
GOLANGCI_LINT_VERSION ?= v1.64.8
223223
YQ_VERSION ?= v4.30.6
224224
KIND_WITH_REGISTRY_VERSION ?= 0.17.0
225225
HELM_DOCS_VERSION ?= v1.12.0

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ Please note this table only reports end-to-end tests suite coverage, others vers
6464
6565
| Temporal Operator | Temporal | Kubernetes |
6666
|------------------------|--------------------|----------------|
67+
| v0.22.x (not released) | v1.24.x to v1.28.x | v1.30 to v1.33 |
6768
| v0.21.x | v1.20.x to v1.25.x | v1.27 to v1.31 |
6869
| v0.20.x | v1.19.x to v1.24.x | v1.26 to v1.30 |
6970
| v0.19.x | v1.19.x to v1.23.x | v1.25 to v1.29 |

‎go.mod‎

Lines changed: 76 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/alexandrevilain/temporal-operator
22

3-
go 1.23.0
3+
go 1.24.5
44

5-
toolchain go1.23.1
5+
toolchain go1.24.6
66

77
require (
88
github.com/Masterminds/semver/v3 v3.3.0
@@ -19,10 +19,10 @@ require (
1919
github.com/onsi/gomega v1.36.1
2020
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2
2121
github.com/stretchr/testify v1.10.0
22-
go.temporal.io/api v1.48.0
23-
go.temporal.io/sdk v1.30.1
24-
go.temporal.io/server v1.25.2
25-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
22+
go.temporal.io/api v1.52.0
23+
go.temporal.io/sdk v1.35.0
24+
go.temporal.io/server v1.28.1
25+
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa
2626
google.golang.org/protobuf v1.36.5
2727
gopkg.in/yaml.v3 v3.0.1
2828
istio.io/api v1.24.1
@@ -38,22 +38,33 @@ require (
3838
)
3939

4040
require (
41-
cloud.google.com/go v0.115.1 // indirect
42-
cloud.google.com/go/auth v0.9.4 // indirect
43-
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
44-
cloud.google.com/go/compute/metadata v0.5.1 // indirect
45-
cloud.google.com/go/iam v1.2.0 // indirect
46-
cloud.google.com/go/storage v1.43.0 // indirect
47-
github.com/aws/aws-sdk-go v1.53.15 // indirect
41+
cel.dev/expr v0.20.0 // indirect
42+
cloud.google.com/go v0.118.3 // indirect
43+
cloud.google.com/go/auth v0.15.0 // indirect
44+
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
45+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
46+
cloud.google.com/go/iam v1.4.2 // indirect
47+
cloud.google.com/go/monitoring v1.24.1 // indirect
48+
cloud.google.com/go/storage v1.51.0 // indirect
49+
dario.cat/mergo v1.0.1 // indirect
50+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
51+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
52+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
53+
github.com/Masterminds/goutils v1.1.1 // indirect
54+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
55+
github.com/aws/aws-sdk-go v1.55.6 // indirect
4856
github.com/beorn7/perks v1.0.1 // indirect
4957
github.com/blang/semver/v4 v4.0.0 // indirect
5058
github.com/cactus/go-statsd-client/v5 v5.1.0 // indirect
5159
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5260
github.com/cespare/xxhash/v2 v2.3.0 // indirect
53-
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
61+
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
62+
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
5463
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5564
github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da // indirect
5665
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
66+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
67+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
5768
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
5869
github.com/felixge/httpsnoop v1.0.4 // indirect
5970
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -69,85 +80,93 @@ require (
6980
github.com/golang/protobuf v1.5.4 // indirect
7081
github.com/golang/snappy v0.0.4 // indirect
7182
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
72-
github.com/google/go-cmp v0.6.0 // indirect
83+
github.com/google/go-cmp v0.7.0 // indirect
7384
github.com/google/gofuzz v1.2.0 // indirect
74-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
75-
github.com/google/s2a-go v0.1.8 // indirect
76-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
77-
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
85+
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 // indirect
86+
github.com/google/s2a-go v0.1.9 // indirect
87+
github.com/googleapis/enterprise-certificate-proxy v0.3.5 // indirect
88+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
7889
github.com/gorilla/websocket v1.5.1 // indirect
7990
github.com/gosimple/unidecode v1.0.1 // indirect
8091
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
81-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
92+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
8293
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
94+
github.com/huandu/xstrings v1.5.0 // indirect
8395
github.com/imdario/mergo v0.3.16 // indirect
8496
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8597
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
86-
github.com/jmoiron/sqlx v1.3.4 // indirect
98+
github.com/jmoiron/sqlx v1.4.0 // indirect
8799
github.com/josharian/intern v1.0.0 // indirect
88100
github.com/json-iterator/go v1.1.12 // indirect
89-
github.com/klauspost/compress v1.17.9 // indirect
90-
github.com/mailru/easyjson v0.7.7 // indirect
101+
github.com/klauspost/compress v1.18.0 // indirect
102+
github.com/mailru/easyjson v0.9.0 // indirect
103+
github.com/mitchellh/copystructure v1.2.0 // indirect
91104
github.com/mitchellh/mapstructure v1.5.0 // indirect
105+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
92106
github.com/moby/spdystream v0.4.0 // indirect
93107
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
94108
github.com/modern-go/reflect2 v1.0.2 // indirect
95109
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
96110
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
97-
github.com/nexus-rpc/sdk-go v0.0.12 // indirect
111+
github.com/nexus-rpc/sdk-go v0.3.0 // indirect
98112
github.com/olivere/elastic/v7 v7.0.32 // indirect
99113
github.com/pborman/uuid v1.2.1 // indirect
100114
github.com/pkg/errors v0.9.1 // indirect
115+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
101116
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
102-
github.com/prometheus/client_golang v1.20.4 // indirect
117+
github.com/prometheus/client_golang v1.21.0 // indirect
103118
github.com/prometheus/client_model v0.6.1 // indirect
104-
github.com/prometheus/common v0.55.0 // indirect
119+
github.com/prometheus/common v0.62.0 // indirect
105120
github.com/prometheus/procfs v0.15.1 // indirect
106121
github.com/robfig/cron v1.2.0 // indirect
107122
github.com/robfig/cron/v3 v3.0.1 // indirect
108123
github.com/russross/blackfriday/v2 v2.1.0 // indirect
124+
github.com/shopspring/decimal v1.4.0 // indirect
125+
github.com/spf13/cast v1.7.0 // indirect
109126
github.com/spf13/cobra v1.8.1 // indirect
110127
github.com/spf13/pflag v1.0.5 // indirect
111128
github.com/stretchr/objx v0.5.2 // indirect
112129
github.com/temporalio/sqlparser v0.0.0-20231115171017-f4060bcfa6cb // indirect
113130
github.com/twmb/murmur3 v1.1.8 // indirect
114-
github.com/uber-go/tally/v4 v4.1.17-0.20240412215630-22fe011f5ff0 // indirect
115-
github.com/urfave/cli v1.22.15 // indirect
131+
github.com/uber-go/tally/v4 v4.1.17 // indirect
132+
github.com/urfave/cli v1.22.16 // indirect
116133
github.com/vladimirvivien/gexe v0.3.0 // indirect
117134
github.com/x448/float16 v0.8.4 // indirect
118-
go.opencensus.io v0.24.0 // indirect
119-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
120-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
121-
go.opentelemetry.io/otel v1.29.0 // indirect
122-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect
123-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
124-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
125-
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
126-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
127-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
128-
go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
129-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
130-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
135+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
136+
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
137+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
138+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
139+
go.opentelemetry.io/otel v1.34.0 // indirect
140+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 // indirect
141+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
142+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
143+
go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect
144+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
145+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
146+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
147+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
148+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
131149
go.uber.org/atomic v1.11.0 // indirect
132-
go.uber.org/dig v1.17.1 // indirect
133-
go.uber.org/fx v1.22.0 // indirect
150+
go.uber.org/dig v1.18.0 // indirect
151+
go.uber.org/fx v1.23.0 // indirect
152+
go.uber.org/mock v0.5.0 // indirect
134153
go.uber.org/multierr v1.11.0 // indirect
135154
go.uber.org/zap v1.27.0 // indirect
136-
golang.org/x/crypto v0.31.0 // indirect
137-
golang.org/x/net v0.33.0 // indirect
138-
golang.org/x/oauth2 v0.27.0 // indirect
139-
golang.org/x/sync v0.10.0 // indirect
140-
golang.org/x/sys v0.28.0 // indirect
141-
golang.org/x/term v0.27.0 // indirect
142-
golang.org/x/text v0.21.0 // indirect
143-
golang.org/x/time v0.6.0 // indirect
144-
golang.org/x/tools v0.26.0 // indirect
155+
golang.org/x/crypto v0.37.0 // indirect
156+
golang.org/x/net v0.39.0 // indirect
157+
golang.org/x/oauth2 v0.28.0 // indirect
158+
golang.org/x/sync v0.13.0 // indirect
159+
golang.org/x/sys v0.32.0 // indirect
160+
golang.org/x/term v0.31.0 // indirect
161+
golang.org/x/text v0.24.0 // indirect
162+
golang.org/x/time v0.10.0 // indirect
163+
golang.org/x/tools v0.30.0 // indirect
145164
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
146-
google.golang.org/api v0.198.0 // indirect
147-
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
148-
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
149-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
150-
google.golang.org/grpc v1.66.2 // indirect
165+
google.golang.org/api v0.224.0 // indirect
166+
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
167+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
168+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
169+
google.golang.org/grpc v1.71.0 // indirect
151170
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
152171
gopkg.in/inf.v0 v0.9.1 // indirect
153172
gopkg.in/validator.v2 v2.0.1 // indirect

0 commit comments

Comments
 (0)