Skip to content

Commit

Permalink
Merge pull request #506 from Altinity/0.11.0
Browse files Browse the repository at this point in the history 
0.11.0
  • Loading branch information
@alex-zaitsev
alex-zaitsev committed Aug 20, 2020
2 parents 730166a + 87782c2 commit c95cd1b
Show file tree
Hide file tree
Showing 62 changed files with 2,170 additions and 825 deletions.
4 changes: 1 addition & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

ClickHouse Operator creates, configures and manages ClickHouse clusters running on Kubernetes.

**IMPORTANT: If you upgrade operator from 0.6.0 or earlier to 0.7.0 or later releases please make sure your ClickHouseInstallation name is shorter than 15 symbols. Otherwise DO NOT UPGRADE an operator. Please contact support@altinity.com if you have upgrade issues**

[![issues](https://img.shields.io/github/issues/altinity/clickhouse-operator.svg)](https://github.com/altinity/clickhouse-operator/issues)
[![tags](https://img.shields.io/github/tag/altinity/clickhouse-operator.svg)](https://github.com/altinity/clickhouse-operator/tags)
[![Go Report Card](https://goreportcard.com/badge/github.com/altinity/clickhouse-operator)](https://goreportcard.com/report/github.com/altinity/clickhouse-operator)
Expand All @@ -27,7 +25,7 @@ The ClickHouse Operator for Kubernetes currently provides the following:

## Requirements

* Kubernetes 1.12.6+
* Kubernetes 1.15.11+

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion config/config-dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@ log_backtrace_at: ""
################################################

# Max number of concurrent reconciles in progress
reconcileThreadsNumber: 5
reconcileThreadsNumber: 1
80 changes: 55 additions & 25 deletions deploy/dev/clickhouse-operator-install-dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,6 @@ spec:
type: object
files:
type: object
additionalProperties:
type: string
clusters:
type: array
items:
Expand Down Expand Up @@ -252,9 +250,6 @@ spec:
# DEPRECATED - to be removed soon
definitionType:
type: string
replicasCount:
type: integer
minimum: 1
weight:
type: integer
# Need to be StringBool
Expand All @@ -281,6 +276,10 @@ spec:
- "disabled"
- "Enabled"
- "enabled"
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand All @@ -300,6 +299,9 @@ spec:
type: string
replicaServiceTemplate:
type: string
replicasCount:
type: integer
minimum: 1
replicas:
type: array
items:
Expand All @@ -324,6 +326,10 @@ spec:
type: integer
minimum: 1
maximum: 65535
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand Down Expand Up @@ -354,9 +360,10 @@ spec:
# See namePartShardMaxLen const
maxLength: 15
pattern: "^[a-zA-Z0-9-]{0,15}$"
shardsCount:
type: integer
minimum: 1
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand All @@ -376,6 +383,9 @@ spec:
type: string
replicaServiceTemplate:
type: string
shardsCount:
type: integer
minimum: 1
shards:
type: array
items:
Expand All @@ -400,6 +410,10 @@ spec:
type: integer
minimum: 1
maximum: 65535
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand Down Expand Up @@ -634,6 +648,7 @@ spec:
# List useTypeXXX constants from model
- ""
- "merge"

---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -826,8 +841,6 @@ spec:
type: object
files:
type: object
additionalProperties:
type: string
clusters:
type: array
items:
Expand Down Expand Up @@ -889,9 +902,6 @@ spec:
# DEPRECATED - to be removed soon
definitionType:
type: string
replicasCount:
type: integer
minimum: 1
weight:
type: integer
# Need to be StringBool
Expand All @@ -918,6 +928,10 @@ spec:
- "disabled"
- "Enabled"
- "enabled"
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand All @@ -937,6 +951,9 @@ spec:
type: string
replicaServiceTemplate:
type: string
replicasCount:
type: integer
minimum: 1
replicas:
type: array
items:
Expand All @@ -961,6 +978,10 @@ spec:
type: integer
minimum: 1
maximum: 65535
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand Down Expand Up @@ -991,9 +1012,10 @@ spec:
# See namePartShardMaxLen const
maxLength: 15
pattern: "^[a-zA-Z0-9-]{0,15}$"
shardsCount:
type: integer
minimum: 1
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand All @@ -1013,6 +1035,9 @@ spec:
type: string
replicaServiceTemplate:
type: string
shardsCount:
type: integer
minimum: 1
shards:
type: array
items:
Expand All @@ -1037,6 +1062,10 @@ spec:
type: integer
minimum: 1
maximum: 65535
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand Down Expand Up @@ -1271,6 +1300,7 @@ spec:
# List useTypeXXX constants from model
- ""
- "merge"

---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -1389,7 +1419,7 @@ subjects:
# Possible Template Parameters:
#
# dev
# altinity/clickhouse-operator:0.10.0
# altinity/clickhouse-operator:0.11.0
# etc-clickhouse-operator-files
#
apiVersion: v1
Expand Down Expand Up @@ -1525,7 +1555,7 @@ data:
# Possible Template Parameters:
#
# dev
# altinity/clickhouse-operator:0.10.0
# altinity/clickhouse-operator:0.11.0
# etc-clickhouse-operator-confd-files
#
apiVersion: v1
Expand All @@ -1540,7 +1570,7 @@ data:
# Possible Template Parameters:
#
# dev
# altinity/clickhouse-operator:0.10.0
# altinity/clickhouse-operator:0.11.0
# etc-clickhouse-operator-configd-files
#
apiVersion: v1
Expand Down Expand Up @@ -1596,7 +1626,7 @@ data:
# Possible Template Parameters:
#
# dev
# altinity/clickhouse-operator:0.10.0
# altinity/clickhouse-operator:0.11.0
# etc-clickhouse-operator-templatesd-files
#
apiVersion: v1
Expand Down Expand Up @@ -1695,7 +1725,7 @@ data:
# Possible Template Parameters:
#
# dev
# altinity/clickhouse-operator:0.10.0
# altinity/clickhouse-operator:0.11.0
# etc-clickhouse-operator-usersd-files
#
apiVersion: v1
Expand Down Expand Up @@ -1745,8 +1775,8 @@ data:
# Possible Template Parameters:
#
# dev
# altinity/clickhouse-operator:0.10.0
# altinity/metrics-exporter:0.10.0
# altinity/clickhouse-operator:0.11.0
# altinity/metrics-exporter:0.11.0
#
# Setup Deployment for clickhouse-operator
# Deployment would be created in kubectl-specified namespace
Expand Down Expand Up @@ -1789,7 +1819,7 @@ spec:
name: etc-clickhouse-operator-usersd-files
containers:
- name: clickhouse-operator
image: altinity/clickhouse-operator:0.10.0
image: altinity/clickhouse-operator:0.11.0
imagePullPolicy: Always
volumeMounts:
- name: etc-clickhouse-operator-folder
Expand Down Expand Up @@ -1854,7 +1884,7 @@ spec:
resource: limits.memory

- name: metrics-exporter
image: altinity/metrics-exporter:0.10.0
image: altinity/metrics-exporter:0.11.0
imagePullPolicy: Always
volumeMounts:
- name: etc-clickhouse-operator-folder
Expand Down
31 changes: 23 additions & 8 deletions deploy/dev/clickhouse-operator-install-yaml-template-01-section-crd-01-chi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,6 @@ spec:
type: object
files:
type: object
additionalProperties:
type: string
clusters:
type: array
items:
Expand Down Expand Up @@ -252,9 +250,6 @@ spec:
# DEPRECATED - to be removed soon
definitionType:
type: string
replicasCount:
type: integer
minimum: 1
weight:
type: integer
# Need to be StringBool
Expand All @@ -281,6 +276,10 @@ spec:
- "disabled"
- "Enabled"
- "enabled"
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand All @@ -300,6 +299,9 @@ spec:
type: string
replicaServiceTemplate:
type: string
replicasCount:
type: integer
minimum: 1
replicas:
type: array
items:
Expand All @@ -324,6 +326,10 @@ spec:
type: integer
minimum: 1
maximum: 65535
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand Down Expand Up @@ -354,9 +360,10 @@ spec:
# See namePartShardMaxLen const
maxLength: 15
pattern: "^[a-zA-Z0-9-]{0,15}$"
shardsCount:
type: integer
minimum: 1
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand All @@ -376,6 +383,9 @@ spec:
type: string
replicaServiceTemplate:
type: string
shardsCount:
type: integer
minimum: 1
shards:
type: array
items:
Expand All @@ -400,6 +410,10 @@ spec:
type: integer
minimum: 1
maximum: 65535
settings:
type: object
files:
type: object
templates:
type: object
properties:
Expand Down Expand Up @@ -634,3 +648,4 @@ spec:
# List useTypeXXX constants from model
- ""
- "merge"

Loading

0 comments on commit c95cd1b

Please sign in to comment.