Skip to content

Commit fe2a0f0

Browse files
committed
refactor: use shell-free probe command and remove keeper version probe
1 parent 963ff9a commit fe2a0f0

16 files changed

Lines changed: 23 additions & 1440 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ jobs:
207207
deploy_target: test-compat-e2e-olm
208208
- name: supported-clickhouse-compatibility
209209
k8s_image: v1.30.13
210-
clickhouse_version: "26.3,26.2,26.1,25.8"
210+
clickhouse_version: "26.3,26.3-distroless,26.2,26.1,25.8"
211211
deploy_target: test-compat-e2e-manifest
212212
steps:
213213
- name: Checkout code

api/v1alpha1/keepercluster_types.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ type KeeperClusterSpec struct {
5858
// +optional
5959
// +kubebuilder:default:="cluster.local"
6060
ClusterDomain string `json:"clusterDomain,omitempty"`
61-
62-
// UpgradeChannel specifies the release channel for major version upgrade checks.
63-
// When empty, only minor updates will be proposed. Allowed values are: stable, lts or specific major.minor version (e.g. 25.8).
64-
// +optional
65-
// +kubebuilder:validation:Pattern=`^(lts|stable|\d+\.\d+)?$`
66-
UpgradeChannel string `json:"upgradeChannel,omitempty"`
67-
68-
// VersionProbeTemplate overrides for the version detection Job.
69-
// +optional
70-
VersionProbeTemplate *VersionProbeTemplate `json:"versionProbeTemplate,omitempty"`
7161
}
7262

7363
// WithDefaults sets default values for KeeperClusterSpec fields.
@@ -156,15 +146,6 @@ type KeeperClusterStatus struct {
156146
// ObservedGeneration indicates latest generation observed by controller.
157147
// +operator-sdk:csv:customresourcedefinitions:type=status
158148
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
159-
// Version indicates the version reported by the container image.
160-
// +optional
161-
// +operator-sdk:csv:customresourcedefinitions:type=status
162-
Version string `json:"version,omitempty"`
163-
// VersionProbeRevision is the image hash of the last successful version probe.
164-
// When this matches the current image hash, the cached Version is used directly.
165-
// +optional
166-
// +operator-sdk:csv:customresourcedefinitions:type=status
167-
VersionProbeRevision string `json:"versionProbeRevision,omitempty"`
168149
}
169150

170151
// KeeperCluster is the Schema for the `keeperclusters` API.
@@ -175,7 +156,6 @@ type KeeperClusterStatus struct {
175156
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message"
176157
// +kubebuilder:printcolumn:name="ReadyReplicas",type="number",JSONPath=".status.readyReplicas"
177158
// +kubebuilder:printcolumn:name="Replicas",type="number",JSONPath=".spec.replicas"
178-
// +kubebuilder:printcolumn:name="Version",type="string",JSONPath=".status.version"
179159
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
180160
// +operator-sdk:csv:customresourcedefinitions:resources={{Pod,v1}}
181161
// +operator-sdk:csv:customresourcedefinitions:resources={{PersistentVolumeClaim,v1}}

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/clickhouse.com_keeperclusters.yaml

Lines changed: 0 additions & 636 deletions
Large diffs are not rendered by default.

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Kustomization
55
images:
66
- name: controller
77
newName: ghcr.io/clickhouse/clickhouse-operator
8-
newTag: v0.0.1
8+
newTag: v0.0.5-96c322c

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ spec:
8787
displayName: Version Probe Revision
8888
path: versionProbeRevision
8989
version: v1alpha1
90-
- description: KeeperCluster is the Schema for the `keeperclusters` API.
91-
displayName: Keeper Cluster
90+
- displayName: Keeper Cluster
9291
kind: KeeperCluster
9392
name: keeperclusters.clickhouse.com
9493
resources:
@@ -141,14 +140,6 @@ spec:
141140
revision.
142141
displayName: Update Revision
143142
path: updateRevision
144-
- description: Version indicates the version reported by the container image.
145-
displayName: Version
146-
path: version
147-
- description: |-
148-
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.
150-
displayName: Version Probe Revision
151-
path: versionProbeRevision
152143
version: v1alpha1
153144
description: |
154145
The ClickHouse Operator is a Kubernetes operator that automates the deployment, configuration, and management of ClickHouse clusters and ClickHouse Keeper clusters on Kubernetes.

dist/chart-cluster/values.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,3 @@ keeper:
124124
# Configuration parameters for ClickHouse Keeper server.
125125
# settings: {}
126126

127-
# UpgradeChannel specifies the release channel for major version upgrade checks.
128-
# When empty, only minor updates will be proposed. Allowed values are: stable, lts or specific major.minor version (e.g. 25.8).
129-
# upgradeChannel: ""
130-
131-
# VersionProbeTemplate overrides for the version detection Job.
132-
# versionProbeTemplate: {}
133-

0 commit comments

Comments
 (0)