Skip to content

Commit f24fc01

Browse files
Merge pull request #155 from AKamyshnikova/bump-go-1.22
Bump go1.22 and update bootstrap version
2 parents 9c3fb45 + 1a86629 commit f24fc01

22 files changed

+2821
-4976
lines changed

Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
################################################################################
1616

1717
# Name of this service/application
18+
1819
SERVICE_NAME := casskop
1920

2021
BUILD_FOLDER = .
2122
MOUNTDIR = $(PWD)
2223

23-
BOOTSTRAP_IMAGE ?= ghcr.io/cscetbon/casskop-bootstrap:0.1.16
24+
BOOTSTRAP_IMAGE ?= ghcr.io/cscetbon/casskop-bootstrap:0.1.19
2425
TELEPRESENCE_REGISTRY ?= datawire
2526
KUBESQUASH_REGISTRY:=
2627
KUBECONFIG ?= ~/.kube/config
@@ -47,14 +48,6 @@ update-crds:
4748
@yq -i e '$(SPEC_PROPS).config.type = "object"' config/crd/bases/db.orange.com_cassandraclusters.yaml
4849
@yq -i e '$(SPEC_PROPS).topology.properties.dc.items.properties.config.type = "object"' config/crd/bases/db.orange.com_cassandraclusters.yaml
4950
@yq -i e '$(SPEC_PROPS).topology.properties.dc.items.properties.rack.items.properties.config.type = "object"' config/crd/bases/db.orange.com_cassandraclusters.yaml
50-
for crd in config/crd/bases/*.yaml; do \
51-
crdname=$$(basename $$crd); \
52-
end=$$(expr $$(grep -n ^status $$crd|cut -f1 -d:) - 1); \
53-
cat $$(echo v1-crds/$$crdname|sed 's/.yaml/_crd.yaml/') > /tmp/$$crdname; \
54-
sed -e '1,/versions/d' -e "1,$${end}s/^..//" $$crd >> /tmp/$$crdname; \
55-
cp /tmp/$$crdname $$crd; \
56-
yq -i e '$(FIRST_VERSION).storage = false' $$crd; \
57-
done
5851
for chart in $(shell ls charts); do \
5952
cp -v config/crd/bases/*.yaml charts/$$chart/crds/; \
6053
done

api/v2/cassandracluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const (
2121
DefaultReadinessHealthCheckPeriod int32 = 10
2222

2323
defaultCassandraImage = "cassandra:3.11.10"
24-
defaultBootstrapImage = "ghcr.io/cscetbon/casskop-bootstrap:0.1.16"
24+
defaultBootstrapImage = "ghcr.io/cscetbon/casskop-bootstrap:0.1.19"
2525
defaultConfigBuilderImage = "datastax/cass-config-builder:1.0.4"
2626

2727
DefaultBackRestImage = "ghcr.io/cscetbon/instaclustr-icarus:1.1.3"

api/v2/cassandrarestore_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ type CassandraRestoreSpec struct {
8484
// +genclient:noStatus
8585
// +resourceName=cassandrarestores
8686
// +kubebuilder:object:root=true
87-
8887
// CassandraRestore is a Casskop Operator resource that represents the restoration of a backup of a Cassandra cluster
8988
type CassandraRestore struct {
9089
metav1.TypeMeta `json:",inline"`

api/v2/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.
Lines changed: 33 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
4+
annotations:
5+
controller-gen.kubebuilder.io/version: v0.16.5
46
name: cassandrabackups.db.orange.com
57
spec:
68
group: db.orange.com
@@ -11,101 +13,6 @@ spec:
1113
singular: cassandrabackup
1214
scope: Namespaced
1315
versions:
14-
- name: v1alpha1
15-
schema:
16-
openAPIV3Schema:
17-
description: Defines a backup operation and its details
18-
properties:
19-
apiVersion:
20-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
21-
type: string
22-
kind:
23-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
24-
type: string
25-
metadata:
26-
type: object
27-
spec:
28-
properties:
29-
bandwidth:
30-
description: Specify the bandwidth to not exceed when uploading files to the cloud. Format supported is \d+[KMG] case insensitive. You can use values like 10M (meaning 10MB), 1024, 1024K, 2G, etc...
31-
type: string
32-
cassandraCluster:
33-
description: Name of the CassandraCluster to backup
34-
type: string
35-
concurrentConnections:
36-
description: Maximum number of threads used to download files from the cloud. Defaults to 10
37-
format: int32
38-
type: integer
39-
datacenter:
40-
description: Cassandra DC name to back up, used to find the cassandra nodes in the CassandraCluster
41-
type: string
42-
duration:
43-
description: Specify a duration the backup should try to last. See https://golang.org/pkg/time/#ParseDuration for an exhaustive list of the supported units. You can use values like .25h, 15m, 900s all meaning 15 minutes
44-
type: string
45-
entities:
46-
description: Database entities to backup, it might be either only keyspaces or only tables prefixed by their respective keyspace, e.g. 'k1,k2' if one wants to backup whole keyspaces or 'ks1.t1,ks2.t2' if one wants to restore specific tables. These formats are mutually exclusive so 'k1,k2.t2' is invalid. An empty field will backup all keyspaces
47-
type: string
48-
schedule:
49-
description: Specify a schedule to assigned to the backup. The schedule doesn't enforce anything so if you schedule multiple backups around the same time they would conflict. See https://godoc.org/github.com/robfig/cron for more information regarding the supported formats
50-
type: string
51-
secret:
52-
description: Name of Secret to use when accessing cloud storage providers
53-
type: string
54-
snapshotTag:
55-
description: name of snapshot to make so this snapshot will be uploaded to storage location. If not specified, the name of snapshot will be automatically generated and it will have name 'autosnap-milliseconds-since-epoch'
56-
type: string
57-
storageLocation:
58-
description: URI for the backup target location e.g. s3 bucket, filepath
59-
type: string
60-
required:
61-
- cassandraCluster
62-
- snapshotTag
63-
- storageLocation
64-
type: object
65-
status:
66-
properties:
67-
condition:
68-
description: BackRestCondition describes the observed state of a Restore at a certain point
69-
properties:
70-
failureCause:
71-
items:
72-
properties:
73-
message:
74-
description: message explaining the error
75-
type: string
76-
source:
77-
description: hostame of a node where this error has occurred
78-
type: string
79-
type: object
80-
type: array
81-
lastTransitionTime:
82-
type: string
83-
type:
84-
type: string
85-
required:
86-
- type
87-
type: object
88-
coordinatorMember:
89-
description: Name of the pod the restore operation is executed on
90-
type: string
91-
id:
92-
description: unique identifier of an operation, a random id is assigned to each operation after a request is submitted, from caller's perspective, an id is sent back as a response to his request so he can further query state of that operation, referencing id, by operations/{id} endpoint
93-
type: string
94-
progress:
95-
description: Progress is a percentage, 100% means the operation is completed, either successfully or with errors
96-
type: string
97-
timeCompleted:
98-
type: string
99-
timeCreated:
100-
type: string
101-
timeStarted:
102-
type: string
103-
type: object
104-
required:
105-
- spec
106-
type: object
107-
served: true
108-
storage: false
10916
- name: v2
11017
schema:
11118
openAPIV3Schema:
@@ -115,10 +22,19 @@ spec:
11522
- spec
11623
properties:
11724
apiVersion:
118-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
25+
description: |-
26+
APIVersion defines the versioned schema of this representation of an object.
27+
Servers should convert recognized schemas to the latest internal value, and
28+
may reject unrecognized values.
29+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
11930
type: string
12031
kind:
121-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
32+
description: |-
33+
Kind is a string value representing the REST resource this object represents.
34+
Servers may infer this from the endpoint the client submits requests to.
35+
Cannot be updated.
36+
In CamelCase.
37+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
12238
type: string
12339
metadata:
12440
type: object
@@ -130,7 +46,9 @@ spec:
13046
- storageLocation
13147
properties:
13248
bandwidth:
133-
description: Specify the bandwidth to not exceed when uploading files to the cloud. Format supported is \d+[KMG] case insensitive. You can use values like 10M (meaning 10MB), 1024, 1024K, 2G, etc...
49+
description: |-
50+
Specify the bandwidth to not exceed when uploading files to the cloud. Format supported is \d+[KMG] case
51+
insensitive. You can use values like 10M (meaning 10MB), 1024, 1024K, 2G, etc...
13452
type: string
13553
cassandraCluster:
13654
description: Name of the CassandraCluster to backup
@@ -143,19 +61,28 @@ spec:
14361
description: Cassandra DC name to back up, used to find the cassandra nodes in the CassandraCluster
14462
type: string
14563
duration:
146-
description: Specify a duration the backup should try to last. See https://golang.org/pkg/time/#ParseDuration for an exhaustive list of the supported units. You can use values like .25h, 15m, 900s all meaning 15 minutes
64+
description: |-
65+
Specify a duration the backup should try to last. See https://golang.org/pkg/time/#ParseDuration for an
66+
exhaustive list of the supported units. You can use values like .25h, 15m, 900s all meaning 15 minutes
14767
type: string
14868
entities:
149-
description: Database entities to backup, it might be either only keyspaces or only tables prefixed by their respective keyspace, e.g. 'k1,k2' if one wants to backup whole keyspaces or 'ks1.t1,ks2.t2' if one wants to restore specific tables. These formats are mutually exclusive so 'k1,k2.t2' is invalid. An empty field will backup all keyspaces
69+
description: |-
70+
Database entities to backup, it might be either only keyspaces or only tables prefixed by their respective
71+
keyspace, e.g. 'k1,k2' if one wants to backup whole keyspaces or 'ks1.t1,ks2.t2' if one wants to restore specific
72+
tables. These formats are mutually exclusive so 'k1,k2.t2' is invalid. An empty field will backup all keyspaces
15073
type: string
15174
schedule:
152-
description: Specify a schedule to assigned to the backup. The schedule doesn't enforce anything so if you schedule multiple backups around the same time they would conflict. See https://godoc.org/github.com/robfig/cron for more information regarding the supported formats
75+
description: |-
76+
Specify a schedule to assigned to the backup. The schedule doesn't enforce anything so if you schedule multiple
77+
backups around the same time they would conflict. See https://godoc.org/github.com/robfig/cron for more information regarding the supported formats
15378
type: string
15479
secret:
15580
description: Name of Secret to use when accessing cloud storage providers
15681
type: string
15782
snapshotTag:
158-
description: name of snapshot to make so this snapshot will be uploaded to storage location. If not specified, the name of snapshot will be automatically generated and it will have name 'autosnap-milliseconds-since-epoch'
83+
description: |-
84+
name of snapshot to make so this snapshot will be uploaded to storage location. If not specified, the name of
85+
snapshot will be automatically generated and it will have name 'autosnap-milliseconds-since-epoch'
15986
type: string
16087
storageLocation:
16188
description: URI for the backup target location e.g. s3 bucket, filepath
@@ -188,7 +115,10 @@ spec:
188115
description: Name of the pod the restore operation is executed on
189116
type: string
190117
id:
191-
description: unique identifier of an operation, a random id is assigned to each operation after a request is submitted, from caller's perspective, an id is sent back as a response to his request so he can further query state of that operation, referencing id, by operations/{id} endpoint
118+
description: |-
119+
unique identifier of an operation, a random id is assigned to each operation after a request is submitted,
120+
from caller's perspective, an id is sent back as a response to his request so he can further query state of that operation,
121+
referencing id, by operations/{id} endpoint
192122
type: string
193123
progress:
194124
description: Progress is a percentage, 100% means the operation is completed, either successfully or with errors
@@ -201,9 +131,3 @@ spec:
201131
type: string
202132
served: true
203133
storage: true
204-
status:
205-
acceptedNames:
206-
kind: ""
207-
plural: ""
208-
conditions: []
209-
storedVersions: []

0 commit comments

Comments
 (0)