Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ jobs:
deploy_target: test-compat-e2e-olm
- name: supported-clickhouse-compatibility
k8s_image: v1.30.13
clickhouse_version: "26.3,26.2,26.1,25.8"
clickhouse_version: "26.3,26.3-distroless,26.2,26.1,25.8"
deploy_target: test-compat-e2e-manifest
- name: operator-upgrade
k8s_image: v1.30.13
Expand Down
7 changes: 5 additions & 2 deletions api/v1alpha1/keepercluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ type KeeperClusterSpec struct {
UpgradeChannel string `json:"upgradeChannel,omitempty"`

// VersionProbeTemplate overrides for the version detection Job.
//
// Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
// +optional
VersionProbeTemplate *VersionProbeTemplate `json:"versionProbeTemplate,omitempty"`
}
Expand Down Expand Up @@ -161,12 +163,13 @@ type KeeperClusterStatus struct {
// ObservedGeneration indicates latest generation observed by controller.
// +operator-sdk:csv:customresourcedefinitions:type=status
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
// Version indicates the version reported by the container image.
// Version indicates the version reported by the Keeper server.
// +optional
// +operator-sdk:csv:customresourcedefinitions:type=status
Version string `json:"version,omitempty"`
// VersionProbeRevision is the image hash of the last successful version probe.
// When this matches the current image hash, the cached Version is used directly.
//
// Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
// +optional
// +operator-sdk:csv:customresourcedefinitions:type=status
VersionProbeRevision string `json:"versionProbeRevision,omitempty"`
Expand Down
13 changes: 8 additions & 5 deletions config/crd/bases/clickhouse.com_keeperclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6163,8 +6163,10 @@ spec:
pattern: ^(lts|stable|\d+\.\d+)?$
type: string
versionProbeTemplate:
description: VersionProbeTemplate overrides for the version detection
Job.
description: |-
VersionProbeTemplate overrides for the version detection Job.

Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
properties:
metadata:
description: Metadata applied to the version probe Job.
Expand Down Expand Up @@ -6869,13 +6871,14 @@ spec:
spec revision.
type: string
version:
description: Version indicates the version reported by the container
image.
description: Version indicates the version reported by the Keeper
server.
type: string
versionProbeRevision:
description: |-
VersionProbeRevision is the image hash of the last successful version probe.
When this matches the current image hash, the cached Version is used directly.

Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
type: string
type: object
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ spec:
revision.
displayName: Update Revision
path: updateRevision
- description: Version indicates the version reported by the container image.
- description: Version indicates the version reported by the Keeper server.
displayName: Version
path: version
- description: |-
VersionProbeRevision is the image hash of the last successful version probe.
When this matches the current image hash, the cached Version is used directly.
Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
displayName: Version Probe Revision
path: versionProbeRevision
version: v1alpha1
Expand Down
2 changes: 2 additions & 0 deletions dist/chart-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,7 @@ keeper:
# upgradeChannel: ""

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

13 changes: 8 additions & 5 deletions dist/chart/templates/crd/keeperclusters.clickhouse.com.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6166,8 +6166,10 @@ spec:
pattern: ^(lts|stable|\d+\.\d+)?$
type: string
versionProbeTemplate:
description: VersionProbeTemplate overrides for the version detection
Job.
description: |-
VersionProbeTemplate overrides for the version detection Job.

Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
properties:
metadata:
description: Metadata applied to the version probe Job.
Expand Down Expand Up @@ -6872,13 +6874,14 @@ spec:
spec revision.
type: string
version:
description: Version indicates the version reported by the container
image.
description: Version indicates the version reported by the Keeper
server.
type: string
versionProbeRevision:
description: |-
VersionProbeRevision is the image hash of the last successful version probe.
When this matches the current image hash, the cached Version is used directly.

Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
type: string
type: object
type: object
Expand Down
Loading
Loading