Skip to content
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

Jump to bottom

Removed owner reference from etcd statefulsets #48

Merged
merged 10 commits into from
Apr 28, 2020
Merged

Removed owner reference from etcd statefulsets #48

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bd043e4
Removed owner ref from etcd sts
Apr 22, 2020
cadbe23
Modifying test cases to reflect removal of ownerRef
Apr 23, 2020
9a76a09
review suggestions
Apr 23, 2020
48a4f01
Added test to check pod restarts on reconcile of failed statefulset
Apr 14, 2020
664f77e
Added test case to validate sts spec change on etcd resource update.
Apr 15, 2020
72cfa6f
Added test to check pod restarts on reconcile of failed statefulset
Apr 14, 2020
dca06b7
Added test case to validate sts spec change on etcd resource update.
Apr 15, 2020
fe77b02
Added tests to verify sts reconciliation reflects etcd.Spec parent fi…
Apr 18, 2020
8cede83
Added testcases for ownerRef to owner annotation conversion in etcd s…
Apr 26, 2020
28b3c0e
Changed tests to table tests.
Apr 28, 2020
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
4 changes: 2 additions & 2 deletions api/v1alpha1/etcd_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ type EtcdSpec struct {
// It must match the pod template's labels.
// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
Selector *metav1.LabelSelector `json:"selector"`
// +optional
Labels map[string]string `json:"labels,omitempty"`
// +required
amshuman-kr marked this conversation as resolved.
Show resolved Hide resolved
Labels map[string]string `json:"labels"`
// +optional
Annotations map[string]string `json:"annotations,omitempty"`
// +required
Expand Down
13 changes: 4 additions & 9 deletions charts/etcd/templates/etcd-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ metadata:
name: {{ .Values.name }}
namespace: {{ .Release.Namespace }}
annotations:
gardener.cloud/owned-by: "{{ .Release.Namespace }}/{{ .Values.name }}"
gardener.cloud/owner-type: "etcd"
{{- if .Values.annotations }}
{{ toYaml .Values.annotations | indent 4 }}
{{- end }}
Expand All @@ -13,13 +15,6 @@ metadata:
{{- if .Values.labels }}
{{ toYaml .Values.labels | indent 4 }}
{{- end }}
ownerReferences:
- apiVersion: druid.gardener.cloud/v1alpha1
blockOwnerDeletion: true
controller: true
kind: Etcd
name: {{ .Values.name }}
uid: {{ .Values.uid }}
spec:
updateStrategy:
type: RollingUpdate
Expand Down Expand Up @@ -48,9 +43,9 @@ spec:
- ip: "127.0.0.1"
hostnames:
- {{ .Values.name }}-local
{{- if .Values.priorityClassName }}
{{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName }}
{{- end }}
{{- end }}
containers:
- name: etcd
image: {{ .Values.etcd.image }}
Expand Down
1 change: 1 addition & 0 deletions config/crd/bases/druid.gardener.cloud_etcds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ spec:
required:
- backup
- etcd
- labels
- replicas
- selector
type: object
Expand Down
Loading