Merge pull request #1769 from Altinity/0.25.2

0.25.2

Author: sunsingerus

.dockerignore

@@ -1,13 +1,17 @@
+dev/bin/
+dev/log/
 docs/
 hack/
 tests/
+tmp/
 .devspace/
-.vagrant/
 .idea/
+.vagrant/
 
 devspace.yaml
 Vagrantfile
 
+
 config/config-dev.yaml
 config/secret.yaml
 

deploy/clickhouse-keeper/clickhouse-keeper-manually/clickhouse-keeper-1-node-256M-for-test-only.yaml

@@ -111,7 +111,10 @@ metadata:
 data:
   env.sh: |
     #!/usr/bin/env bash
-    export DOMAIN=`hostname -d`
+    HOST=$(hostname -s)
+    FQDN=$(cat /etc/hostname)
+    DOMAIN=${FQDN#${HOST}.}
+    export DOMAIN
     export CLIENT_HOST=clickhouse-keeper
     export CLIENT_PORT=2181
     export RAFT_PORT=9444
@@ -353,6 +356,7 @@ spec:
         prometheus.io/port: '7000'
         prometheus.io/scrape: 'true'
     spec:
+      setHostnameAsFQDN: true
 # affinity removed to allow use in single node test environment
 #      affinity:
 #        podAntiAffinity:

deploy/clickhouse-keeper/clickhouse-keeper-manually/clickhouse-keeper-1-node.yaml

@@ -93,7 +93,10 @@ metadata:
 data:
   env.sh: |
     #!/usr/bin/env bash
-    export DOMAIN=`hostname -d`
+    HOST=$(hostname -s)
+    FQDN=$(cat /etc/hostname)
+    DOMAIN=${FQDN#${HOST}.}
+    export DOMAIN
     export CLIENT_HOST=clickhouse-keeper
     export CLIENT_PORT=2181
     export RAFT_PORT=9444
@@ -335,6 +338,7 @@ spec:
         prometheus.io/port: '7000'
         prometheus.io/scrape: 'true'
     spec:
+      setHostnameAsFQDN: true
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

deploy/clickhouse-keeper/clickhouse-keeper-manually/clickhouse-keeper-3-nodes-256M-for-test-only.yaml

@@ -111,7 +111,10 @@ metadata:
 data:
   env.sh: |
     #!/usr/bin/env bash
-    export DOMAIN=`hostname -d`
+    HOST=$(hostname -s)
+    FQDN=$(cat /etc/hostname)
+    DOMAIN=${FQDN#${HOST}.}
+    export DOMAIN
     export CLIENT_HOST=clickhouse-keeper
     export CLIENT_PORT=2181
     export RAFT_PORT=9444
@@ -353,6 +356,7 @@ spec:
         prometheus.io/port: '7000'
         prometheus.io/scrape: 'true'
     spec:
+      setHostnameAsFQDN: true
 # affinity removed to allow use in single node test environment
 #      affinity:
 #        podAntiAffinity:

deploy/clickhouse-keeper/clickhouse-keeper-manually/clickhouse-keeper-3-nodes.yaml

@@ -93,7 +93,10 @@ metadata:
 data:
   env.sh: |
     #!/usr/bin/env bash
-    export DOMAIN=`hostname -d`
+    HOST=$(hostname -s)
+    FQDN=$(cat /etc/hostname)
+    DOMAIN=${FQDN#${HOST}.}
+    export DOMAIN
     export CLIENT_HOST=clickhouse-keeper
     export CLIENT_PORT=2181
     export RAFT_PORT=9444
@@ -335,6 +338,7 @@ spec:
         prometheus.io/port: '7000'
         prometheus.io/scrape: 'true'
     spec:
+      setHostnameAsFQDN: true
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

deploy/helm/clickhouse-operator/Chart.yaml

@@ -13,8 +13,8 @@ description: |-
     kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml
   ```
 type: application
-version: 0.25.1
-appVersion: 0.25.1
+version: 0.25.2
+appVersion: 0.25.2
 home: https://github.com/Altinity/clickhouse-operator
 icon: https://logosandtypes.com/wp-content/uploads/2020/12/altinity.svg
 maintainers:

deploy/helm/clickhouse-operator/README.md

@@ -1,6 +1,6 @@
 # altinity-clickhouse-operator
 
-![Version: 0.25.1](https://img.shields.io/badge/Version-0.25.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.25.1](https://img.shields.io/badge/AppVersion-0.25.1-informational?style=flat-square)
+![Version: 0.25.2](https://img.shields.io/badge/Version-0.25.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.25.2](https://img.shields.io/badge/AppVersion-0.25.2-informational?style=flat-square)
 
 Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator).
 

deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml

@@ -4,14 +4,14 @@
 # SINGULAR=clickhouseinstallation
 # PLURAL=clickhouseinstallations
 # SHORT=chi
-# OPERATOR_VERSION=0.25.1
+# OPERATOR_VERSION=0.25.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.25.1
+    clickhouse.altinity.com/chop: 0.25.2
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced

deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml

@@ -4,14 +4,14 @@
 # SINGULAR=clickhouseinstallationtemplate
 # PLURAL=clickhouseinstallationtemplates
 # SHORT=chit
-# OPERATOR_VERSION=0.25.1
+# OPERATOR_VERSION=0.25.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallationtemplates.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.25.1
+    clickhouse.altinity.com/chop: 0.25.2
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced

deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml

@@ -1,13 +1,13 @@
 # Template Parameters:
 #
-# OPERATOR_VERSION=0.25.1
+# OPERATOR_VERSION=0.25.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com
   labels:
-    clickhouse-keeper.altinity.com/chop: 0.25.1
+    clickhouse-keeper.altinity.com/chop: 0.25.2
 spec:
   group: clickhouse-keeper.altinity.com
   scope: Namespaced