Skip to content

Commit 6e96f8e

Browse files
authored
feat: support distroless images in ch version probe, remove keeper version probe job (#195)
1 parent 10a6f02 commit 6e96f8e

17 files changed

Lines changed: 290 additions & 238 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ jobs:
238238
deploy_target: test-compat-e2e-olm
239239
- name: supported-clickhouse-compatibility
240240
k8s_image: v1.30.13
241-
clickhouse_version: "26.5,26.4,26.3,25.8"
241+
clickhouse_version: "26.5,26.5-distroless,26.4,26.3,25.8"
242242
deploy_target: test-compat-e2e-manifest
243243
- name: operator-upgrade
244244
k8s_image: v1.30.13

api/v1alpha1/conditions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const (
4040
ConditionReasonConfigReloadFailed ConditionReason = "ConfigReloadFailed"
4141
ConditionReasonConfigReloadPending ConditionReason = "ConfigReloadPending"
4242

43-
// ConditionTypeVersionInSync indicates that all replicas report the same version as the image.
43+
// ConditionTypeVersionInSync indicates that all replicas report the same version.
4444
ConditionTypeVersionInSync ConditionType = "VersionInSync"
4545
ConditionReasonVersionMatch ConditionReason = "VersionMatch"
4646
ConditionReasonVersionMismatch ConditionReason = "VersionMismatch"

api/v1alpha1/keepercluster_types.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ type KeeperClusterSpec struct {
6666
UpgradeChannel string `json:"upgradeChannel,omitempty"`
6767

6868
// VersionProbeTemplate overrides for the version detection Job.
69+
//
70+
// Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
6971
// +optional
7072
VersionProbeTemplate *VersionProbeTemplate `json:"versionProbeTemplate,omitempty"`
7173
}
@@ -161,12 +163,13 @@ type KeeperClusterStatus struct {
161163
// ObservedGeneration indicates latest generation observed by controller.
162164
// +operator-sdk:csv:customresourcedefinitions:type=status
163165
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
164-
// Version indicates the version reported by the container image.
166+
// Version indicates the version reported by the Keeper server.
165167
// +optional
166168
// +operator-sdk:csv:customresourcedefinitions:type=status
167169
Version string `json:"version,omitempty"`
168170
// VersionProbeRevision is the image hash of the last successful version probe.
169-
// When this matches the current image hash, the cached Version is used directly.
171+
//
172+
// Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
170173
// +optional
171174
// +operator-sdk:csv:customresourcedefinitions:type=status
172175
VersionProbeRevision string `json:"versionProbeRevision,omitempty"`

config/crd/bases/clickhouse.com_keeperclusters.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6163,8 +6163,10 @@ spec:
61636163
pattern: ^(lts|stable|\d+\.\d+)?$
61646164
type: string
61656165
versionProbeTemplate:
6166-
description: VersionProbeTemplate overrides for the version detection
6167-
Job.
6166+
description: |-
6167+
VersionProbeTemplate overrides for the version detection Job.
6168+
6169+
Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
61686170
properties:
61696171
metadata:
61706172
description: Metadata applied to the version probe Job.
@@ -6869,13 +6871,14 @@ spec:
68696871
spec revision.
68706872
type: string
68716873
version:
6872-
description: Version indicates the version reported by the container
6873-
image.
6874+
description: Version indicates the version reported by the Keeper
6875+
server.
68746876
type: string
68756877
versionProbeRevision:
68766878
description: |-
68776879
VersionProbeRevision is the image hash of the last successful version probe.
6878-
When this matches the current image hash, the cached Version is used directly.
6880+
6881+
Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
68796882
type: string
68806883
type: object
68816884
type: object

config/manifests/bases/clickhouse-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ spec:
141141
revision.
142142
displayName: Update Revision
143143
path: updateRevision
144-
- description: Version indicates the version reported by the container image.
144+
- description: Version indicates the version reported by the Keeper server.
145145
displayName: Version
146146
path: version
147147
- description: |-
148148
VersionProbeRevision is the image hash of the last successful version probe.
149-
When this matches the current image hash, the cached Version is used directly.
149+
Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
150150
displayName: Version Probe Revision
151151
path: versionProbeRevision
152152
version: v1alpha1

dist/chart-cluster/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,5 +162,7 @@ keeper:
162162
# upgradeChannel: ""
163163

164164
# VersionProbeTemplate overrides for the version detection Job.
165+
#
166+
# Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
165167
# versionProbeTemplate: {}
166168

dist/chart/templates/crd/keeperclusters.clickhouse.com.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6166,8 +6166,10 @@ spec:
61666166
pattern: ^(lts|stable|\d+\.\d+)?$
61676167
type: string
61686168
versionProbeTemplate:
6169-
description: VersionProbeTemplate overrides for the version detection
6170-
Job.
6169+
description: |-
6170+
VersionProbeTemplate overrides for the version detection Job.
6171+
6172+
Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
61716173
properties:
61726174
metadata:
61736175
description: Metadata applied to the version probe Job.
@@ -6872,13 +6874,14 @@ spec:
68726874
spec revision.
68736875
type: string
68746876
version:
6875-
description: Version indicates the version reported by the container
6876-
image.
6877+
description: Version indicates the version reported by the Keeper
6878+
server.
68776879
type: string
68786880
versionProbeRevision:
68796881
description: |-
68806882
VersionProbeRevision is the image hash of the last successful version probe.
6881-
When this matches the current image hash, the cached Version is used directly.
6883+
6884+
Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
68826885
type: string
68836886
type: object
68846887
type: object

0 commit comments

Comments
 (0)