Skip to content

Commit 32bd52f

Browse files
Merge pull request #153 from AKamyshnikova/bump-go-1.21
Bump go 1.21 and k8s api libs
2 parents 311e4ad + 6c8e699 commit 32bd52f

File tree

9 files changed

+138
-107
lines changed

9 files changed

+138
-107
lines changed

charts/casskop/crds/db.orange.com_cassandraclusters.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,6 +2118,9 @@ spec:
21182118
- type: integer
21192119
- type: string
21202120
x-kubernetes-int-or-string: true
2121+
restartPolicy:
2122+
description: 'RestartPolicy defines the restart behavior of individual containers in a pod. This field may only be set for init containers, and the only allowed value is "Always". For non-init containers or when this field is not specified, the restart behavior is defined by the Pod''s restart policy and the container type. Setting the RestartPolicy as "Always" for the init container will have the following effect: this init container will be continually restarted on exit until all regular containers have terminated. Once all regular containers have completed, all init containers with restartPolicy "Always" will be shut down. This lifecycle differs from normal init containers and is often referred to as a "sidecar" container. Although this init container still starts in the init container sequence, it does not wait for the container to complete before proceeding to the next init container. Instead, the next init container starts immediately after this init container is started, or after any startupProbe has successfully completed.'
2123+
type: string
21212124
securityContext:
21222125
description: 'SecurityContext defines the security options the container should be run with. If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext. More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
21232126
type: object
@@ -2184,7 +2187,7 @@ spec:
21842187
- type
21852188
properties:
21862189
localhostProfile:
2187-
description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must only be set if type is "Localhost".
2190+
description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must be set if type is "Localhost". Must NOT be set for any other type.
21882191
type: string
21892192
type:
21902193
description: "type indicates which kind of seccomp profile will be applied. Valid options are: \n Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied."
@@ -2200,7 +2203,7 @@ spec:
22002203
description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
22012204
type: string
22022205
hostProcess:
2203-
description: HostProcess determines if a container should be run as a 'Host Process' container. This field is alpha-level and will only be honored by components that enable the WindowsHostProcessContainers feature flag. Setting this field without the feature flag will result in errors when validating the Pod. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true.
2206+
description: HostProcess determines if a container should be run as a 'Host Process' container. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true.
22042207
type: boolean
22052208
runAsUserName:
22062209
description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.

charts/multi-casskop/crds/db.orange.com_cassandraclusters.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,6 +2118,9 @@ spec:
21182118
- type: integer
21192119
- type: string
21202120
x-kubernetes-int-or-string: true
2121+
restartPolicy:
2122+
description: 'RestartPolicy defines the restart behavior of individual containers in a pod. This field may only be set for init containers, and the only allowed value is "Always". For non-init containers or when this field is not specified, the restart behavior is defined by the Pod''s restart policy and the container type. Setting the RestartPolicy as "Always" for the init container will have the following effect: this init container will be continually restarted on exit until all regular containers have terminated. Once all regular containers have completed, all init containers with restartPolicy "Always" will be shut down. This lifecycle differs from normal init containers and is often referred to as a "sidecar" container. Although this init container still starts in the init container sequence, it does not wait for the container to complete before proceeding to the next init container. Instead, the next init container starts immediately after this init container is started, or after any startupProbe has successfully completed.'
2123+
type: string
21212124
securityContext:
21222125
description: 'SecurityContext defines the security options the container should be run with. If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext. More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
21232126
type: object
@@ -2184,7 +2187,7 @@ spec:
21842187
- type
21852188
properties:
21862189
localhostProfile:
2187-
description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must only be set if type is "Localhost".
2190+
description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must be set if type is "Localhost". Must NOT be set for any other type.
21882191
type: string
21892192
type:
21902193
description: "type indicates which kind of seccomp profile will be applied. Valid options are: \n Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied."
@@ -2200,7 +2203,7 @@ spec:
22002203
description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
22012204
type: string
22022205
hostProcess:
2203-
description: HostProcess determines if a container should be run as a 'Host Process' container. This field is alpha-level and will only be honored by components that enable the WindowsHostProcessContainers feature flag. Setting this field without the feature flag will result in errors when validating the Pod. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true.
2206+
description: HostProcess determines if a container should be run as a 'Host Process' container. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true.
22042207
type: boolean
22052208
runAsUserName:
22062209
description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.

config/crd/bases/db.orange.com_cassandraclusters.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,6 +2118,9 @@ spec:
21182118
- type: integer
21192119
- type: string
21202120
x-kubernetes-int-or-string: true
2121+
restartPolicy:
2122+
description: 'RestartPolicy defines the restart behavior of individual containers in a pod. This field may only be set for init containers, and the only allowed value is "Always". For non-init containers or when this field is not specified, the restart behavior is defined by the Pod''s restart policy and the container type. Setting the RestartPolicy as "Always" for the init container will have the following effect: this init container will be continually restarted on exit until all regular containers have terminated. Once all regular containers have completed, all init containers with restartPolicy "Always" will be shut down. This lifecycle differs from normal init containers and is often referred to as a "sidecar" container. Although this init container still starts in the init container sequence, it does not wait for the container to complete before proceeding to the next init container. Instead, the next init container starts immediately after this init container is started, or after any startupProbe has successfully completed.'
2123+
type: string
21212124
securityContext:
21222125
description: 'SecurityContext defines the security options the container should be run with. If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext. More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
21232126
type: object
@@ -2184,7 +2187,7 @@ spec:
21842187
- type
21852188
properties:
21862189
localhostProfile:
2187-
description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must only be set if type is "Localhost".
2190+
description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must be set if type is "Localhost". Must NOT be set for any other type.
21882191
type: string
21892192
type:
21902193
description: "type indicates which kind of seccomp profile will be applied. Valid options are: \n Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied."
@@ -2200,7 +2203,7 @@ spec:
22002203
description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
22012204
type: string
22022205
hostProcess:
2203-
description: HostProcess determines if a container should be run as a 'Host Process' container. This field is alpha-level and will only be honored by components that enable the WindowsHostProcessContainers feature flag. Setting this field without the feature flag will result in errors when validating the Pod. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true.
2206+
description: HostProcess determines if a container should be run as a 'Host Process' container. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true.
22042207
type: boolean
22052208
runAsUserName:
22062209
description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.

docker/casskop/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20 as build
1+
FROM golang:1.21 as build
22

33
ARG COMPILED_DATE
44
ARG VERSION

docker/multi-casskop/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19 as build
1+
FROM golang:1.21 as build
22

33
ENV GO111MODULE=on
44

go.mod

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cscetbon/casskop
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
emperror.dev/errors v0.8.0
@@ -9,13 +9,13 @@ require (
99
github.com/antihax/optional v1.0.0
1010
github.com/banzaicloud/k8s-objectmatcher v1.8.0
1111
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
12-
github.com/go-logr/logr v1.2.4
12+
github.com/go-logr/logr v1.3.0
1313
github.com/instaclustr/instaclustr-icarus-go-client v0.0.0-20210427160512-5264f1cbba08
1414
github.com/jarcoal/httpmock v1.3.0
1515
github.com/mitchellh/mapstructure v1.4.1
1616
github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce
1717
github.com/operator-framework/operator-lib v0.11.0
18-
github.com/prometheus/client_golang v1.15.1
18+
github.com/prometheus/client_golang v1.16.0
1919
github.com/r3labs/diff v0.0.0-20190801153147-a71de73c46ad
2020
github.com/robfig/cron/v3 v3.0.1
2121
github.com/sirupsen/logrus v1.9.0
@@ -25,9 +25,9 @@ require (
2525
github.com/zput/zxcTool v1.3.6
2626
go.uber.org/zap v1.27.0
2727
golang.org/x/text v0.14.0
28-
k8s.io/api v0.27.5
29-
k8s.io/apimachinery v0.27.5
30-
k8s.io/client-go v0.27.5
28+
k8s.io/api v0.28.11
29+
k8s.io/apimachinery v0.28.11
30+
k8s.io/client-go v0.28.11
3131
sigs.k8s.io/controller-runtime v0.15.0
3232
)
3333

@@ -36,20 +36,20 @@ require (
3636
github.com/beorn7/perks v1.0.1 // indirect
3737
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3838
github.com/davecgh/go-spew v1.1.1 // indirect
39-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
39+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4040
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4141
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4242
github.com/fsnotify/fsnotify v1.6.0 // indirect
4343
github.com/go-logr/zapr v1.2.4 // indirect
4444
github.com/go-openapi/jsonpointer v0.19.6 // indirect
45-
github.com/go-openapi/jsonreference v0.20.1 // indirect
45+
github.com/go-openapi/jsonreference v0.20.2 // indirect
4646
github.com/go-openapi/swag v0.22.3 // indirect
4747
github.com/gogo/protobuf v1.3.2 // indirect
4848
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
49-
github.com/golang/protobuf v1.5.3 // indirect
50-
github.com/google/gnostic v0.5.7-v3refs // indirect
51-
github.com/google/go-cmp v0.5.9 // indirect
52-
github.com/google/gofuzz v1.1.0 // indirect
49+
github.com/golang/protobuf v1.5.4 // indirect
50+
github.com/google/gnostic-models v0.6.8 // indirect
51+
github.com/google/go-cmp v0.6.0 // indirect
52+
github.com/google/gofuzz v1.2.0 // indirect
5353
github.com/google/uuid v1.3.0 // indirect
5454
github.com/imdario/mergo v0.3.12 // indirect
5555
github.com/josharian/intern v1.0.0 // indirect
@@ -64,12 +64,12 @@ require (
6464
github.com/pkg/errors v0.9.1 // indirect
6565
github.com/pmezard/go-difflib v1.0.0 // indirect
6666
github.com/prometheus/client_model v0.4.0 // indirect
67-
github.com/prometheus/common v0.42.0 // indirect
68-
github.com/prometheus/procfs v0.9.0 // indirect
67+
github.com/prometheus/common v0.44.0 // indirect
68+
github.com/prometheus/procfs v0.10.1 // indirect
6969
github.com/spf13/pflag v1.0.5 // indirect
70-
go.uber.org/multierr v1.10.0 // indirect
70+
go.uber.org/multierr v1.11.0 // indirect
7171
golang.org/x/net v0.23.0 // indirect
72-
golang.org/x/oauth2 v0.5.0 // indirect
72+
golang.org/x/oauth2 v0.10.0 // indirect
7373
golang.org/x/sys v0.18.0 // indirect
7474
golang.org/x/term v0.18.0 // indirect
7575
golang.org/x/time v0.3.0 // indirect
@@ -80,11 +80,11 @@ require (
8080
gopkg.in/yaml.v2 v2.4.0 // indirect
8181
gopkg.in/yaml.v3 v3.0.1 // indirect
8282
k8s.io/apiextensions-apiserver v0.27.2 // indirect
83-
k8s.io/component-base v0.27.5 // indirect
84-
k8s.io/klog/v2 v2.90.1 // indirect
85-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
86-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
83+
k8s.io/component-base v0.28.11 // indirect
84+
k8s.io/klog/v2 v2.110.1 // indirect
85+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
86+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
8787
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
88-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
88+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
8989
sigs.k8s.io/yaml v1.3.0 // indirect
9090
)

0 commit comments

Comments
 (0)