From f04748b129d333710981a714378a4d0ab5c5f11f Mon Sep 17 00:00:00 2001 From: bopo Date: Tue, 24 Mar 2020 10:31:45 +0800 Subject: [PATCH 1/4] update commit --- scripts/create_pg_cert_secret.sh | 0 stolon/templates/proxy-deploy.yaml | 2 +- stolon/templates/sentinel-deploy.yaml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 scripts/create_pg_cert_secret.sh diff --git a/scripts/create_pg_cert_secret.sh b/scripts/create_pg_cert_secret.sh old mode 100644 new mode 100755 diff --git a/stolon/templates/proxy-deploy.yaml b/stolon/templates/proxy-deploy.yaml index bf3c65c..1b86ed4 100644 --- a/stolon/templates/proxy-deploy.yaml +++ b/stolon/templates/proxy-deploy.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "stolon.proxy.fullname" . }} diff --git a/stolon/templates/sentinel-deploy.yaml b/stolon/templates/sentinel-deploy.yaml index 68db7bc..74002db 100644 --- a/stolon/templates/sentinel-deploy.yaml +++ b/stolon/templates/sentinel-deploy.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "stolon.sentinel.fullname" . }} From 5af07093c325e6e13b754e162b93ee84104ff7a6 Mon Sep 17 00:00:00 2001 From: bopo Date: Tue, 24 Mar 2020 11:24:52 +0800 Subject: [PATCH 2/4] update commit --- stolon/templates/keeper-statefulset.yaml | 5 ++++- stolon/templates/proxy-deploy.yaml | 3 +++ stolon/templates/sentinel-deploy.yaml | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/stolon/templates/keeper-statefulset.yaml b/stolon/templates/keeper-statefulset.yaml index 8a100e9..a56a3cd 100644 --- a/stolon/templates/keeper-statefulset.yaml +++ b/stolon/templates/keeper-statefulset.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: StatefulSet metadata: name: {{ template "stolon.keeper.fullname" . }} @@ -12,6 +12,9 @@ metadata: spec: serviceName: {{ template "stolon.keeper.fullname" . }} replicas: {{ .Values.keeper.replicas }} + selector: + matchLabels: + app: {{ template "stolon.name" . }} template: metadata: labels: diff --git a/stolon/templates/proxy-deploy.yaml b/stolon/templates/proxy-deploy.yaml index 1b86ed4..b11a774 100644 --- a/stolon/templates/proxy-deploy.yaml +++ b/stolon/templates/proxy-deploy.yaml @@ -11,6 +11,9 @@ metadata: heritage: "{{ .Release.Service }}" spec: replicas: {{ .Values.proxy.replicas }} + selector: + matchLabels: + app: {{ template "stolon.name" . }} template: metadata: labels: diff --git a/stolon/templates/sentinel-deploy.yaml b/stolon/templates/sentinel-deploy.yaml index 74002db..63b55c3 100644 --- a/stolon/templates/sentinel-deploy.yaml +++ b/stolon/templates/sentinel-deploy.yaml @@ -11,6 +11,9 @@ metadata: heritage: "{{ .Release.Service }}" spec: replicas: {{ .Values.sentinel.replicas }} + selector: + matchLabels: + app: {{ template "stolon.name" . }} template: metadata: labels: From d5251d132ba1239114be45adbfd21e7235785ebb Mon Sep 17 00:00:00 2001 From: bopo Date: Tue, 24 Mar 2020 11:28:57 +0800 Subject: [PATCH 3/4] update commit --- stolon/templates/keeper-statefulset.yaml | 6 +++++- stolon/templates/proxy-deploy.yaml | 6 +++++- stolon/templates/sentinel-deploy.yaml | 7 ++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/stolon/templates/keeper-statefulset.yaml b/stolon/templates/keeper-statefulset.yaml index a56a3cd..e201512 100644 --- a/stolon/templates/keeper-statefulset.yaml +++ b/stolon/templates/keeper-statefulset.yaml @@ -14,7 +14,11 @@ spec: replicas: {{ .Values.keeper.replicas }} selector: matchLabels: - app: {{ template "stolon.name" . }} + app: {{ template "stolon.keeper.fullname" . }} + release: "{{ .Release.Name }}" + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "stolon-keeper" + stolon-cluster: {{ template "stolon.clusterName" . }} template: metadata: labels: diff --git a/stolon/templates/proxy-deploy.yaml b/stolon/templates/proxy-deploy.yaml index b11a774..fe6fa36 100644 --- a/stolon/templates/proxy-deploy.yaml +++ b/stolon/templates/proxy-deploy.yaml @@ -13,7 +13,11 @@ spec: replicas: {{ .Values.proxy.replicas }} selector: matchLabels: - app: {{ template "stolon.name" . }} + app: {{ template "stolon.proxy.fullname" . }} + release: "{{ .Release.Name }}" + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "stolon-proxy" + stolon-cluster: {{ template "stolon.clusterName" . }} template: metadata: labels: diff --git a/stolon/templates/sentinel-deploy.yaml b/stolon/templates/sentinel-deploy.yaml index 63b55c3..bf0653f 100644 --- a/stolon/templates/sentinel-deploy.yaml +++ b/stolon/templates/sentinel-deploy.yaml @@ -13,7 +13,12 @@ spec: replicas: {{ .Values.sentinel.replicas }} selector: matchLabels: - app: {{ template "stolon.name" . }} + app: {{ template "stolon.sentinel.fullname" . }} + release: "{{ .Release.Name }}" + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "stolon-sentinel" + stolon-cluster: {{ template "stolon.clusterName" . }} + stolon-sentinel: "true" template: metadata: labels: From 4be2d076b3d829afca02484789a75303e63ea9a1 Mon Sep 17 00:00:00 2001 From: bopo Date: Tue, 24 Mar 2020 11:50:16 +0800 Subject: [PATCH 4/4] update commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e8a69e..e5ebe26 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Chart is partially based on the statefullset example from the [stolon repo](http ## Requirements -* Kubernetes >1.5 +* Kubernetes > v1.17 * PV support on the underlying infrastructure * Helm 2.2.0 (for `conditions and flags` support)