Skip to content

Add annotations value to EtcdCluster in helm chart #4764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
derekperkins merged 2 commits into from
Mar 30, 2019
Merged

Add annotations value to EtcdCluster in helm chart #4764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b9a55a
Add annotations value to EtcdCluster in helm chart to make etcd clust…
ch3rub1m Mar 29, 2019
ee7bbef
Add some comments for cluster wide etcd operator
ch3rub1m Mar 29, 2019
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
7 changes: 7 additions & 0 deletions helm/vitess/templates/_etcd.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
{{- $replicas := index . 1 -}}
{{- $version := index . 2 -}}
{{- $resources := index . 3 }}
{{- $clusterWide := index . 4 }}

###################################
# EtcdCluster
Expand All @@ -15,6 +16,12 @@ apiVersion: "etcd.database.coreos.com/v1beta2"
kind: "EtcdCluster"
metadata:
name: "etcd-{{ $name }}"
## Adding this annotation make this cluster managed by clusterwide operators
## namespaced operators ignore it
annotations:
{{ if $clusterWide }}
etcd.database.coreos.com/scope: clusterwide
{{ end }}
spec:
size: {{ $replicas }}
version: {{ $version | quote }}
Expand Down
6 changes: 4 additions & 2 deletions helm/vitess/templates/vitess.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@
{{- $replicas := $.Values.topology.globalCell.replicas | default $.Values.etcd.replicas -}}
{{- $version := $.Values.topology.globalCell.version | default $.Values.etcd.version -}}
{{- $resources := $.Values.topology.globalCell.resources | default $.Values.etcd.resources -}}
{{- $clusterWide := $.Values.topology.globalCell.resources | default $.Values.etcd.clusterWide -}}

{{ include "etcd" (tuple "global" $replicas $version $resources) }}
{{ include "etcd" (tuple "global" $replicas $version $resources $clusterWide) }}

# Create requested resources in each cell.
{{ range $cell := $.Values.topology.cells }}
Expand All @@ -41,8 +42,9 @@
{{- $replicas := $cell.etcd.replicas | default $.Values.etcd.replicas -}}
{{- $version := $cell.etcd.version | default $.Values.etcd.version -}}
{{- $resources := $cell.etcd.resources | default $.Values.etcd.resources -}}
{{- $clusterWide := $cell.etcd.clusterWide | default $.Values.etcd.clusterWide -}}

{{ include "etcd" (tuple $cellClean $replicas $version $resources) }}
{{ include "etcd" (tuple $cellClean $replicas $version $resources $clusterWide) }}
---
# create one controller per cell
{{ include "vtctld" (tuple $.Values.topology $cell $.Values.vtctld $.Release.Namespace $.Values.config) }}
Expand Down
3 changes: 3 additions & 0 deletions helm/vitess/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ etcd:
requests:
cpu: 200m
memory: 100Mi
# If clusterWide is set to true, will add an annotation to EtcdCluster
# to make this cluster managed by clusterwide operators
# clusterWide: true

# Default values for vtctld resources defined in 'topology'
vtctld:
Expand Down