diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 89b435eb..76c35dfc 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -22,6 +22,8 @@ jobs: run: timeout: 5m issues-exit-code: 0 + output: + uniq-by-line: false linters-settings: gosimple: checks: @@ -37,4 +39,4 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.51.2 + version: v1.54 diff --git a/Makefile b/Makefile index 366e7c95..edb2336a 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ SERVICE_NAME := casskop BUILD_FOLDER = . MOUNTDIR = $(PWD) -BOOTSTRAP_IMAGE ?= ghcr.io/cscetbon/casskop-bootstrap:0.1.13 +BOOTSTRAP_IMAGE ?= ghcr.io/cscetbon/casskop-bootstrap:0.1.14 TELEPRESENCE_REGISTRY ?= datawire KUBESQUASH_REGISTRY:= KUBECONFIG ?= ~/.kube/config diff --git a/api/v2/cassandracluster_types.go b/api/v2/cassandracluster_types.go index f40b0b22..dfeb24f1 100644 --- a/api/v2/cassandracluster_types.go +++ b/api/v2/cassandracluster_types.go @@ -21,7 +21,7 @@ const ( DefaultReadinessHealthCheckPeriod int32 = 10 defaultCassandraImage = "cassandra:3.11.10" - defaultBootstrapImage = "ghcr.io/cscetbon/casskop-bootstrap:0.1.13" + defaultBootstrapImage = "ghcr.io/cscetbon/casskop-bootstrap:0.1.14" defaultConfigBuilderImage = "datastax/cass-config-builder:1.0.4" DefaultBackRestImage = "ghcr.io/cscetbon/instaclustr-icarus:1.1.3" diff --git a/go.mod b/go.mod index 25b893a6..47d13c48 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/time v0.3.0 // indirect gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index de00fbd1..1c5a0a50 100644 --- a/go.sum +++ b/go.sum @@ -369,8 +369,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/multi-casskop/go.mod b/multi-casskop/go.mod index afc5ba4a..c46e9a6c 100644 --- a/multi-casskop/go.mod +++ b/multi-casskop/go.mod @@ -46,7 +46,7 @@ require ( golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/multi-casskop/go.sum b/multi-casskop/go.sum index 1fba24e3..293783a1 100644 --- a/multi-casskop/go.sum +++ b/multi-casskop/go.sum @@ -1277,8 +1277,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= diff --git a/test/kuttl/backup-restore/00-createCluster.yaml b/test/kuttl/backup-restore/00-createCluster.yaml index b7991378..b8f8de65 100644 --- a/test/kuttl/backup-restore/00-createCluster.yaml +++ b/test/kuttl/backup-restore/00-createCluster.yaml @@ -5,7 +5,7 @@ metadata: spec: nodesPerRacks: 2 cassandraImage: cassandra:3.11.9 - bootstrapImage: ghcr.io/cscetbon/casskop-bootstrap:0.1.13 + bootstrapImage: ghcr.io/cscetbon/casskop-bootstrap:0.1.14 dataCapacity: 256Mi hardAntiAffinity: false deletePVC: true diff --git a/test/kuttl/sidecars/00-assert.yaml b/test/kuttl/sidecars/00-assert.yaml index 852334da..c4e62546 100644 --- a/test/kuttl/sidecars/00-assert.yaml +++ b/test/kuttl/sidecars/00-assert.yaml @@ -47,7 +47,7 @@ spec: - name: config-builder image: datastax/cass-config-builder:1.0.3 - name: bootstrap - image: ghcr.io/cscetbon/casskop-bootstrap:0.1.13 + image: ghcr.io/cscetbon/casskop-bootstrap:0.1.14 containers: - args: - tail diff --git a/website/docs/2_setup/5_upgrade_v1_to_v2.md b/website/docs/2_setup/5_upgrade_v1_to_v2.md index ffe5d93a..031b7e8c 100644 --- a/website/docs/2_setup/5_upgrade_v1_to_v2.md +++ b/website/docs/2_setup/5_upgrade_v1_to_v2.md @@ -33,7 +33,7 @@ kubectl apply -f config/crd/bases ## Edit your CassandraCluster object Now it's time to edit your object and add the cassandra/java configuration from your configmap in there. -You also have to update the bootstrap image version to *0.1.13*. +You also have to update the bootstrap image version to *0.1.14*. ```shell kubectl edit cassandraclusters.db.orange.com your-object ``` @@ -47,7 +47,7 @@ metadata: spec: nodesPerRacks: 2 cassandraImage: cassandra:3.11.9 - bootstrapImage: ghcr.io/cscetbon/casskop-bootstrap:0.1.13 + bootstrapImage: ghcr.io/cscetbon/casskop-bootstrap:0.1.14 config: cassandra-yaml: num_tokens: 256