Skip to content

Commit

Permalink
Merge pull request #24 from gmarkey/master
Browse files Browse the repository at this point in the history 
altinity-clickhouse-operator: Upgrade for 0.18.0 release
  • Loading branch information
@slamdev
slamdev authored Feb 4, 2022
2 parents a10a4cf + df549de commit 089ebdf
Show file tree
Hide file tree
Showing 5 changed files with 291 additions and 159 deletions.
4 changes: 2 additions & 2 deletions charts/altinity-clickhouse-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ description: |-
Refer to operator repo for additional information.
type: application
version: 0.0.11
appVersion: 0.16.1
version: 0.0.12
appVersion: 0.18.0
home: https://github.com/slamdev/helm-charts/tree/master/charts/altinity-clickhouse-operator
icon: https://artifacthub.io/image/2d6aa29c-c74f-4bff-bede-ba7e6e0315a7@2x
maintainers:
Expand Down
2 changes: 1 addition & 1 deletion charts/altinity-clickhouse-operator/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# altinity-clickhouse-operator

![Version: 0.0.11](https://img.shields.io/badge/Version-0.0.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.16.1](https://img.shields.io/badge/AppVersion-0.16.1-informational?style=flat-square)
![Version: 0.0.12](https://img.shields.io/badge/Version-0.0.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.18.0](https://img.shields.io/badge/AppVersion-0.18.0-informational?style=flat-square)

Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator).

Expand Down
28 changes: 22 additions & 6 deletions ...erator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: clickhouseinstallations.clickhouse.altinity.com
labels:
clickhouse.altinity.com/chop: 0.18.0
spec:
group: clickhouse.altinity.com
scope: Namespaced
Expand All @@ -27,7 +29,7 @@ spec:
type: string
description: Operator version
priority: 1 # show in wide view
jsonPath: .status.version
jsonPath: .status.chop-version
- name: clusters
type: integer
description: Clusters count
Expand Down Expand Up @@ -88,20 +90,30 @@ spec:
- spec
properties:
apiVersion:
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'
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'
type: string
kind:
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'
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'
type: string
metadata:
type: object
status:
type: object
description: "Current ClickHouseInstallation manifest status, contains many fields like a normalized configuration, clickhouse-operator version, current action and all applied action list, current taskID and all applied taskIDs and other"
properties:
version:
chop-version:
type: string
description: "Version"
description: "ClickHouse operator version"
chop-commit:
type: string
description: "ClickHouse operator git commit SHA"
chop-date:
type: string
description: "ClickHouse operator build date"
clusters:
type: integer
minimum: 0
Expand Down Expand Up @@ -232,7 +244,7 @@ spec:
- "enabled"
restart:
type: string
description: "restart policy for StatefulSets. When value `RollingUpdate` it allow graceful restart one by one instead of restart all StatefulSet simultaneously"
description: "This is a 'soft restart' button. When set to 'RollingUpdate' operator will restart ClickHouse pods in a graceful way. Remove it after the use in order to avoid unneeded restarts"
enum:
- ""
- "RollingUpdate"
Expand Down Expand Up @@ -286,6 +298,7 @@ spec:
properties:
policy:
type: string
description: DEPRECATED
configMapPropagationTimeout:
type: integer
description: |
Expand Down Expand Up @@ -669,6 +682,7 @@ spec:
# See namePartShardMaxLen const
maxLength: 15
pattern: "^[a-zA-Z0-9-]{0,15}$"

definitionType:
type: string
description: "DEPRECATED - to be removed soon"
Expand Down Expand Up @@ -1108,6 +1122,7 @@ spec:
type: string
replicaServiceTemplate:
type: string

podTemplates:
type: array
description: |
Expand Down Expand Up @@ -1210,6 +1225,7 @@ spec:
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
# nullable: true
x-kubernetes-preserve-unknown-fields: true

volumeClaimTemplates:
type: array
description: "allows define template for rendering `PVC` kubernetes resource, which would use inside `Pod` for mount clickhouse `data`, clickhouse `logs` or something else"
Expand Down
29 changes: 23 additions & 6 deletions ...rds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# Template Parameters:
#
# KIND=ClickHouseInstallationTemplate
Expand All @@ -9,6 +10,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: clickhouseinstallationtemplates.clickhouse.altinity.com
labels:
clickhouse.altinity.com/chop: 0.18.0
spec:
group: clickhouse.altinity.com
scope: Namespaced
Expand All @@ -27,7 +30,7 @@ spec:
type: string
description: Operator version
priority: 1 # show in wide view
jsonPath: .status.version
jsonPath: .status.chop-version
- name: clusters
type: integer
description: Clusters count
Expand Down Expand Up @@ -88,20 +91,30 @@ spec:
- spec
properties:
apiVersion:
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'
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'
type: string
kind:
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'
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'
type: string
metadata:
type: object
status:
type: object
description: "Current ClickHouseInstallation manifest status, contains many fields like a normalized configuration, clickhouse-operator version, current action and all applied action list, current taskID and all applied taskIDs and other"
properties:
version:
chop-version:
type: string
description: "Version"
description: "ClickHouse operator version"
chop-commit:
type: string
description: "ClickHouse operator git commit SHA"
chop-date:
type: string
description: "ClickHouse operator build date"
clusters:
type: integer
minimum: 0
Expand Down Expand Up @@ -232,7 +245,7 @@ spec:
- "enabled"
restart:
type: string
description: "restart policy for StatefulSets. When value `RollingUpdate` it allow graceful restart one by one instead of restart all StatefulSet simultaneously"
description: "This is a 'soft restart' button. When set to 'RollingUpdate' operator will restart ClickHouse pods in a graceful way. Remove it after the use in order to avoid unneeded restarts"
enum:
- ""
- "RollingUpdate"
Expand Down Expand Up @@ -286,6 +299,7 @@ spec:
properties:
policy:
type: string
description: DEPRECATED
configMapPropagationTimeout:
type: integer
description: |
Expand Down Expand Up @@ -669,6 +683,7 @@ spec:
# See namePartShardMaxLen const
maxLength: 15
pattern: "^[a-zA-Z0-9-]{0,15}$"

definitionType:
type: string
description: "DEPRECATED - to be removed soon"
Expand Down Expand Up @@ -1108,6 +1123,7 @@ spec:
type: string
replicaServiceTemplate:
type: string

podTemplates:
type: array
description: |
Expand Down Expand Up @@ -1210,6 +1226,7 @@ spec:
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
# nullable: true
x-kubernetes-preserve-unknown-fields: true

volumeClaimTemplates:
type: array
description: "allows define template for rendering `PVC` kubernetes resource, which would use inside `Pod` for mount clickhouse `data`, clickhouse `logs` or something else"
Expand Down
Loading

0 comments on commit 089ebdf

Please sign in to comment.