Skip to content

Commit

Permalink
Upgrade cass-operator version and enable using 5.x.x and 7.x.x versio…
Browse files Browse the repository at this point in the history 
…ns (#1007)
  • Loading branch information
@adejanovski
adejanovski committed Jun 26, 2023
1 parent dc7baf1 commit 6756187
Show file tree
Hide file tree
Showing 16 changed files with 1,795 additions and 541 deletions.
1 change: 1 addition & 0 deletions CHANGELOG/CHANGELOG-1.8.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ When cutting a new release, update the `unreleased` heading to the tag being gen

## unreleased

* [CHANGE] [#1005](https://github.com/k8ssandra/k8ssandra-operator/issues/1005) Support 7.x.x version numbers for DSE and 5.x.x for Cassandra
* [CHANGE] [#985](https://github.com/k8ssandra/k8ssandra-operator/issues/985) CI/CD does not produce images for some commits
* [ENHANCEMENT] [#842](https://github.com/k8ssandra/k8ssandra-operator/issues/842) Remove usages of deprecated created-by label
6 changes: 3 additions & 3 deletions apis/k8ssandra/v1alpha1/k8ssandracluster_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ type CassandraDatacenterTemplate struct {
// DatacenterOptions are configuration settings that are can be set at the Cluster level and overridden for a single DC
type DatacenterOptions struct {
// ServerVersion is the Cassandra or DSE version. The following versions are supported:
// - Cassandra: 3.11.X and 4.0.X
// - DSE: 6.8.X
// +kubebuilder:validation:Pattern=(6\.8\.\d+)|(3\.11\.\d+)|(4\.\d+\.\d+)
// - Cassandra: 3.11.X, 4.X.X and 5.X.X
// - DSE: 6.8.X, 7.x.x
// +kubebuilder:validation:Pattern=(6\.8\.\d+)|(3\.11\.\d+)|(4\.\d+\.\d+)|(5\.\d+\.\d+)|(7\.\d+\.\d+)
ServerVersion string `json:"serverVersion,omitempty"`

// ServerImage is the image for the cassandra container. Note that this should be a
Expand Down
2 changes: 1 addition & 1 deletion config/cass-operator/cluster-scoped/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.15.0
- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=cd5709a218e4973f52575821397f93c16dcd6c40

components:
- ../../components/cass-operator-image-config
2 changes: 1 addition & 1 deletion config/cass-operator/ns-scoped/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.15.0
- github.com/k8ssandra/cass-operator/config/deployments/default?ref=cd5709a218e4973f52575821397f93c16dcd6c40

components:
- ../../components/cass-operator-image-config
1,605 changes: 1,342 additions & 263 deletions config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml
View file

Large diffs are not rendered by default.

75 changes: 72 additions & 3 deletions config/crd/bases/reaper.k8ssandra.io_reapers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1176,6 +1176,27 @@ spec:
initContainerResources:
description: Init Container resources.
properties:
claims:
description: "Claims lists the names of resources, defined in
spec.resourceClaims, that are used by this container. \n This
is an alpha field and requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable. It can only be set
for containers."
items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties:
name:
description: Name must match the name of one entry in pod.spec.resourceClaims
of the Pod where this field is used. It makes that resource
available inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -1662,9 +1683,14 @@ spec:
type: object
supplementalGroups:
description: A list of groups applied to the first process run
in each container, in addition to the container's primary GID. If
unspecified, no groups will be added to any container. Note
that this field cannot be set when spec.os.name is windows.
in each container, in addition to the container's primary GID,
the fsGroup (if specified), and group memberships defined in
the container image for the uid of the container process. If
unspecified, no additional groups are added to any container.
Note that group memberships defined in the container image for
the uid of the container process are still effective, even if
they are not included in this list. Note that this field cannot
be set when spec.os.name is windows.
items:
format: int64
type: integer
Expand Down Expand Up @@ -1871,6 +1897,27 @@ spec:
resources:
description: Main Container resources.
properties:
claims:
description: "Claims lists the names of resources, defined in
spec.resourceClaims, that are used by this container. \n This
is an alpha field and requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable. It can only be set
for containers."
items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties:
name:
description: Name must match the name of one entry in pod.spec.resourceClaims
of the Pod where this field is used. It makes that resource
available inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -2261,6 +2308,28 @@ spec:
description: Resources is the resource requirements for the
Vector agent.
properties:
claims:
description: "Claims lists the names of resources, defined
in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field
is immutable. It can only be set for containers."
items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties:
name:
description: Name must match the name of one entry
in pod.spec.resourceClaims of the Pod where this
field is used. It makes that resource available
inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down
89 changes: 89 additions & 0 deletions config/crd/bases/stargate.k8ssandra.io_stargates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2720,6 +2720,28 @@ spec:
description: Resources is the Kubernetes resource requests and
limits to apply, per Stargate pod. Leave nil to use defaults.
properties:
claims:
description: "Claims lists the names of resources, defined
in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable. It can only
be set for containers."
items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties:
name:
description: Name must match the name of one entry
in pod.spec.resourceClaims of the Pod where this
field is used. It makes that resource available
inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -2956,6 +2978,30 @@ spec:
description: Resources is the resource requirements
for the Vector agent.
properties:
claims:
description: "Claims lists the names of resources,
defined in spec.resourceClaims, that are used
by this container. \n This is an alpha field and
requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable. It can
only be set for containers."
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
properties:
name:
description: Name must match the name of one
entry in pod.spec.resourceClaims of the
Pod where this field is used. It makes that
resource available inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -3182,6 +3228,27 @@ spec:
description: Resources is the Kubernetes resource requests and limits
to apply, per Stargate pod. Leave nil to use defaults.
properties:
claims:
description: "Claims lists the names of resources, defined in
spec.resourceClaims, that are used by this container. \n This
is an alpha field and requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable. It can only be set
for containers."
items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties:
name:
description: Name must match the name of one entry in pod.spec.resourceClaims
of the Pod where this field is used. It makes that resource
available inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -3416,6 +3483,28 @@ spec:
description: Resources is the resource requirements for the
Vector agent.
properties:
claims:
description: "Claims lists the names of resources, defined
in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field
is immutable. It can only be set for containers."
items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties:
name:
description: Name must match the name of one entry
in pod.spec.resourceClaims of the Pod where this
field is used. It makes that resource available
inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down
Loading

0 comments on commit 6756187

Please sign in to comment.