Skip to content

Commit 3cbb558

Browse files
burmanmburmanm
authored
Update k8ssandra-client, update Kubernetes deps, deprecate CDC support (#894)
1 parent 4e2980a commit 3cbb558

File tree

13 files changed

+77
-75
lines changed

13 files changed

+77
-75
lines changed

‎.github/workflows/kindIntegTest.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
version:
9393
- "4.0.17"
9494
integration_test:
95-
- cdc_successful # OSS only
95+
# - cdc_successful # OSS only
9696
- config_fql
9797
runs-on: ubuntu-latest
9898
env:
@@ -115,43 +115,43 @@ jobs:
115115
with:
116116
name: k8s-logs-${{ matrix.integration_test }}
117117
path: ./build/kubectl_dump
118-
kind_dse_tests:
119-
needs: build_docker_images
120-
strategy:
121-
matrix:
122-
version:
123-
- "6.8.54"
124-
integration_test:
125-
- cdc_successful
126-
include:
127-
- version: 6.8.54
128-
serverType: dse
129-
integration_test: "cdc_successful"
130-
fail-fast: true
131-
runs-on: ubuntu-latest
132-
env:
133-
CGO_ENABLED: 0
134-
M_INTEG_DIR: ${{ matrix.integration_test }}
135-
M_SERVER_VERSION: ${{ matrix.version }}
136-
M_SERVER_IMAGE: ${{ matrix.serverImage }}
137-
M_SERVER_TYPE: ${{ matrix.serverType }}
138-
SKIP_GATEKEEPER: true
139-
steps:
140-
- uses: actions/checkout@v4
141-
if: github.event_name == 'pull_request'
142-
with:
143-
ref: ${{ github.event.pull_request.head.sha }}
144-
- uses: actions/checkout@v4
145-
if: github.event_name != 'pull_request'
146-
- uses: ./.github/actions/run-integ-test
147-
with:
148-
integration_test: ${{ matrix.integration_test }}
149-
- name: Archive k8s logs
150-
if: ${{ failure() }}
151-
uses: actions/upload-artifact@v4
152-
with:
153-
name: k8s-logs-smoke_test-${{ matrix.version }}
154-
path: ./build/kubectl_dump
118+
# kind_dse_tests:
119+
# needs: build_docker_images
120+
# strategy:
121+
# matrix:
122+
# version:
123+
# - "6.8.54"
124+
# integration_test:
125+
# - cdc_successful
126+
# include:
127+
# - version: 6.8.54
128+
# serverType: dse
129+
# integration_test: "cdc_successful"
130+
# fail-fast: true
131+
# runs-on: ubuntu-latest
132+
# env:
133+
# CGO_ENABLED: 0
134+
# M_INTEG_DIR: ${{ matrix.integration_test }}
135+
# M_SERVER_VERSION: ${{ matrix.version }}
136+
# M_SERVER_IMAGE: ${{ matrix.serverImage }}
137+
# M_SERVER_TYPE: ${{ matrix.serverType }}
138+
# SKIP_GATEKEEPER: true
139+
# steps:
140+
# - uses: actions/checkout@v4
141+
# if: github.event_name == 'pull_request'
142+
# with:
143+
# ref: ${{ github.event.pull_request.head.sha }}
144+
# - uses: actions/checkout@v4
145+
# if: github.event_name != 'pull_request'
146+
# - uses: ./.github/actions/run-integ-test
147+
# with:
148+
# integration_test: ${{ matrix.integration_test }}
149+
# - name: Archive k8s logs
150+
# if: ${{ failure() }}
151+
# uses: actions/upload-artifact@v4
152+
# with:
153+
# name: k8s-logs-smoke_test-${{ matrix.version }}
154+
# path: ./build/kubectl_dump
155155

156156
kind_int_no_gatekeeper_tests:
157157
needs: build_docker_images

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Changelog for Cass Operator, new PRs should update the `main / unreleased` secti
1111

1212
## unreleased
1313

14-
* [CHANGE] [#875](https://github.com/k8ssandra/cass-operator/issues/875) Update to Go 1.25, Kubernetes 1.34 and UBI10 as the base image. Also, Vector updates and other smaller dependency updates.
14+
* [CHANGE] [#875](https://github.com/k8ssandra/cass-operator/issues/875) Update to Go 1.25, Kubernetes 1.34 and UBI10 as the base image. Also, Vector to 0.53.0 and other smaller dependency updates. Deprecate CDC support.
1515
* [CHANGE] [#876](https://github.com/k8ssandra/cass-operator/issues/876) Drop support for ImageConfig v1beta1, the only supported version from now on is v1beta2
1616
* [CHANGE] [#865](https://github.com/k8ssandra/cass-operator/issues/865) Add VolumeMount for the management-api-server-certs-volume volume to all containers instead of only cassandra container
1717
* [CHANGE] [#850](https://github.com/k8ssandra/cass-operator/issues/850) The default retry policy for CassandraTask has changed to OnFailure

‎apis/cassandra/v1beta1/cassandradatacenter_types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ type CassandraDatacenterSpec struct {
268268
// Additional Annotations allows to define additional labels that will be included in all objects created by the operator. Note, user can override values set by default from the cass-operator and doing so could break cass-operator functionality.
269269
AdditionalAnnotations map[string]string `json:"additionalAnnotations,omitempty"`
270270

271-
// CDC allows configuration of the change data capture agent which can run within the Management API container. Use it to send data to Pulsar.
272-
CDC *CDCConfiguration `json:"cdc,omitempty"`
271+
// Deprecated this field is deprecated and will be removed in the future. DeprecatedCDC allows configuration of the change data capture agent which can run within the Management API container. Use it to send data to Pulsar.
272+
DeprecatedCDC *CDCConfiguration `json:"cdc,omitempty"`
273273

274274
// DatacenterName allows to override the name of the Cassandra datacenter. In Cassandra the DC name will be overridden by this value.
275275
// This setting can create conflicts if multiple DCs coexist in the same namespace if metadata.name for a DC with no override is set to the same value as the override name of another DC.

‎apis/cassandra/v1beta1/cdc_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package v1beta1
22

3+
// DEPRECATED This functionality is deprecated.
34
// CDCConfiguration holds CDC config for the CassandraDatacenter. Note that it cannot contain arrays, channels, maps etc. because of the way the
45
// reflection logic works which marshalls it into a string for the purposes of passing on the command line.
56
type CDCConfiguration struct {

‎apis/cassandra/v1beta1/zz_generated.deepcopy.go‎

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

‎config/crd/bases/cassandra.datastax.com_cassandradatacenters.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,10 @@ spec:
152152
format: int32
153153
type: integer
154154
cdc:
155-
description: CDC allows configuration of the change data capture agent
156-
which can run within the Management API container. Use it to send
157-
data to Pulsar.
155+
description: Deprecated this field is deprecated and will be removed
156+
in the future. DeprecatedCDC allows configuration of the change
157+
data capture agent which can run within the Management API container.
158+
Use it to send data to Pulsar.
158159
properties:
159160
cdcConcurrentProcessors:
160161
type: integer

‎config/imageconfig/image_config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ images:
1515
k8ssandra-client:
1616
repository: "k8ssandra"
1717
name: "k8ssandra-client"
18-
tag: "v0.8.6"
18+
tag: "v0.8.8"
1919
# pullSecret: "k8ssandra-client-pull-secret" # Use of pullSecret removes the default pullSecrets for this image
2020
# pullPolicy: Always
2121
# -- defaults are used when other no override is present for the configured image or image type. All these values can be overridden under any image or image type.

‎config/manager/image_config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
images:
66
system-logger: "k8ssandra/system-logger:latest"
77
config-builder: "docker.io/datastax/cass-config-builder:1.0-ubi"
8-
k8ssandra-client: "docker.io/k8ssandra/k8ssandra-client:v0.8.6"
8+
k8ssandra-client: "docker.io/k8ssandra/k8ssandra-client:v0.8.8"
99
# cassandra:
1010
# "4.0.0": "k8ssandra/cassandra-ubi:latest"
1111
# dse:

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ require (
1010
github.com/pavel-v-chernykh/keystore-go v2.1.0+incompatible
1111
github.com/pkg/errors v0.9.1
1212
github.com/stretchr/testify v1.11.1
13-
golang.org/x/oauth2 v0.33.0 // indirect
14-
golang.org/x/term v0.39.0
15-
k8s.io/api v0.34.3
16-
k8s.io/apimachinery v0.34.3
17-
k8s.io/client-go v0.34.3
13+
golang.org/x/oauth2 v0.35.0 // indirect
14+
golang.org/x/term v0.40.0
15+
k8s.io/api v0.34.4
16+
k8s.io/apimachinery v0.34.4
17+
k8s.io/client-go v0.34.4
1818
sigs.k8s.io/controller-runtime v0.22.5
1919
)
2020

@@ -26,7 +26,7 @@ require (
2626
github.com/prometheus/client_golang v1.23.2
2727
github.com/robfig/cron/v3 v3.0.1
2828
go.uber.org/zap v1.27.1
29-
golang.org/x/mod v0.32.0
29+
golang.org/x/mod v0.33.0
3030
k8s.io/utils v0.0.0-20260108192941-914a6e750570
3131
)
3232

@@ -87,7 +87,7 @@ require (
8787
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
8888
golang.org/x/net v0.49.0 // indirect
8989
golang.org/x/sync v0.19.0 // indirect
90-
golang.org/x/sys v0.40.0 // indirect
90+
golang.org/x/sys v0.41.0 // indirect
9191
golang.org/x/text v0.33.0 // indirect
9292
golang.org/x/time v0.9.0 // indirect
9393
golang.org/x/tools v0.41.0 // indirect

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -203,16 +203,16 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0
203203
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
204204
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
205205
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
206-
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
207-
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
206+
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
207+
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
208208
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
209209
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
210210
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
211211
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
212212
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
213213
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
214-
golang.org/x/oauth2 v0.33.0 h1:4Q+qn+E5z8gPRJfmRy7C2gGG3T4jIprK6aSYgTXGRpo=
215-
golang.org/x/oauth2 v0.33.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
214+
golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ=
215+
golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
216216
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
217217
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
218218
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -221,10 +221,10 @@ golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
221221
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
222222
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
223223
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
224-
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
225-
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
226-
golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
227-
golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
224+
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
225+
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
226+
golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
227+
golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
228228
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
229229
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
230230
golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
@@ -261,16 +261,16 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
261261
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
262262
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
263263
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
264-
k8s.io/api v0.34.3 h1:D12sTP257/jSH2vHV2EDYrb16bS7ULlHpdNdNhEw2S4=
265-
k8s.io/api v0.34.3/go.mod h1:PyVQBF886Q5RSQZOim7DybQjAbVs8g7gwJNhGtY5MBk=
264+
k8s.io/api v0.34.4 h1:Z5hsoQcZ2yBjelb9j5JKzCVo9qv9XLkVm5llnqS4h+0=
265+
k8s.io/api v0.34.4/go.mod h1:6SaGYuGPkMqqCgg8rPG/OQoCrhgSEV+wWn9v21fDP3o=
266266
k8s.io/apiextensions-apiserver v0.34.3 h1:p10fGlkDY09eWKOTeUSioxwLukJnm+KuDZdrW71y40g=
267267
k8s.io/apiextensions-apiserver v0.34.3/go.mod h1:aujxvqGFRdb/cmXYfcRTeppN7S2XV/t7WMEc64zB5A0=
268-
k8s.io/apimachinery v0.34.3 h1:/TB+SFEiQvN9HPldtlWOTp0hWbJ+fjU+wkxysf/aQnE=
269-
k8s.io/apimachinery v0.34.3/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
268+
k8s.io/apimachinery v0.34.4 h1:C5SiSzLEMyWIk53sSbnk0WlOOyqv/MFnWvuc/d6M+xc=
269+
k8s.io/apimachinery v0.34.4/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
270270
k8s.io/apiserver v0.34.3 h1:uGH1qpDvSiYG4HVFqc6A3L4CKiX+aBWDrrsxHYK0Bdo=
271271
k8s.io/apiserver v0.34.3/go.mod h1:QPnnahMO5C2m3lm6fPW3+JmyQbvHZQ8uudAu/493P2w=
272-
k8s.io/client-go v0.34.3 h1:wtYtpzy/OPNYf7WyNBTj3iUA0XaBHVqhv4Iv3tbrF5A=
273-
k8s.io/client-go v0.34.3/go.mod h1:OxxeYagaP9Kdf78UrKLa3YZixMCfP6bgPwPwNBQBzpM=
272+
k8s.io/client-go v0.34.4 h1:IXhvzFdm0e897kXtLbeyMpAGzontcShJ/gi/XCCsOLc=
273+
k8s.io/client-go v0.34.4/go.mod h1:tXIVJTQabT5QRGlFdxZQFxrIhcGUPpKL5DAc4gSWTE8=
274274
k8s.io/component-base v0.34.3 h1:zsEgw6ELqK0XncCQomgO9DpUIzlrYuZYA0Cgo+JWpVk=
275275
k8s.io/component-base v0.34.3/go.mod h1:5iIlD8wPfWE/xSHTRfbjuvUul2WZbI2nOUK65XL0E/c=
276276
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

0 commit comments

Comments
 (0)