Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/etcd-operator] deployment typos and add tolerations #4139

Merged

Conversation

peter-bitfusion
Copy link
Contributor

What this PR does / why we need it:
there are some typos in the deployments in latest. this pr fixes those and adds the option to add tolerations to deployments.

  • the deployment yaml for all three operators has a typo: an extra space before spec.containers[0].command[0]
  • the app label on restore operator pod is {{ template "etcd-restore-operator.fullname" . }}, but the selector on restore operator service is {{ template "etcd-restore-operator.name" . }}

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Special notes for your reviewer:

…optional tolerations to deployments. fixed restore pod, service label and selector mismatch
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 13, 2018
@peter-bitfusion
Copy link
Contributor Author

/assign @lachie83

@alejandroEsc
Copy link
Contributor

trying to add the label /ok-to-test

@alejandroEsc
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 13, 2018
Copy link
Contributor

@alejandroEsc alejandroEsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the contribution!

{{ toYaml .Values.restoreOperator.tolerations | indent 8 }}
{{- end }}
{{- end}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you fix the missing spacing here please?

{{- end}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

likewise here.

{{ toYaml .Values.restoreOperator.tolerations | indent 8 }}
{{- end }}
{{- end}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you fix the missing spacing here.

@@ -15,6 +15,6 @@ spec:
name: http-etcd-restore-port
port: {{ .Values.restoreOperator.port }}
selector:
app: {{ template "etcd-restore-operator.name" . }}
app: {{ template "etcd-restore-operator.fullname" . }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

double check if we mean fullname vs. name.

@@ -15,6 +15,6 @@ spec:
name: http-etcd-restore-port
port: {{ .Values.restoreOperator.port }}
selector:
app: {{ template "etcd-restore-operator.name" . }}
app: {{ template "etcd-restore-operator.fullname" . }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be name.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the purpose of the change was to match the pod label for etcd-restore-operator here . I was seeing an issue where no endpoints were added for restore operator service, because they selector didn't match the actual pod labels. Are you saying we should change restore operator app label to name instead?

@alejandroEsc
Copy link
Contributor

@peter-bitfusion please increment patch version.

@peter-bitfusion
Copy link
Contributor Author

@alejandroEsc @unguiculus thanks for the review and input!

{{ toYaml .Values.backupOperator.tolerations | indent 8 }}
{{- end }}
{{- end}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add a space here also, sorry about this.

@alejandroEsc
Copy link
Contributor

/assign
/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 16, 2018
@lachie83
Copy link
Contributor

@alejandroEsc thanks for the review. Please be sure to use /lgtm

@lachie83
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 22, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alejandroEsc, lachie83, peter-bitfusion

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit d43d09a into helm:master Mar 22, 2018
joshuacox added a commit to joshuacox/charts that referenced this pull request Mar 24, 2018
* upstream/master: (944 commits)
  Rename service port to http (helm#4442)
  [stable/neo4j] Change the image of the initContainer examples (helm#4269)
  move burrow to stable repo (helm#3481)
  Upgrade kube-state-metrics to 1.2.0, add new collectors (helm#4146)
  Add review guidelines around pvcs (helm#4223)
  [stable/parse] Release 0.3.10 (helm#4389)
  [stable/phabricator] Release 0.5.19 (helm#4433)
  Support exposing jmx and additional ports (helm#4072)
  Add default of "" for string comparison (helm#4420)
  [incubator/kafka] Makes readiness probe configurable (helm#3948)
  Published stash chart 0.7.0-rc.1 (helm#4410)
  Enable testing charts with test values (helm#4157)
  [incubator/kafka] Fix initContainer failure which did not error (helm#4400)
  [stable/etcd-operator] deployment typos and add tolerations (helm#4139)
  Typo fix in coscale/README.md (helm#4306)
  Typo fix in concourse/README.md (helm#4303)
  Typo fix in cockroachdb/README.md (helm#4302)
  [stable/jenkins] Bump appVersion (helm#4177)
  Typo fix in cluster-autoscaler/README.md (helm#4301)
  [stable/traefik] Bump appVersion to 1.5.4 (helm#4206)
  ...
rolanddb pushed a commit to Eneco/charts that referenced this pull request Apr 9, 2018
* stable etcd chart: fixed deployment typo extra space in yamls. added optional tolerations to deployments. fixed restore pod, service label and selector mismatch

* fixed {{- end}} typos. changed restore operator app label to use `name` instead of `fullname`

* incremented chart patch

* (fix): add consistent space
ichtar pushed a commit to Bestmile/charts that referenced this pull request May 15, 2018
* stable etcd chart: fixed deployment typo extra space in yamls. added optional tolerations to deployments. fixed restore pod, service label and selector mismatch

* fixed {{- end}} typos. changed restore operator app label to use `name` instead of `fullname`

* incremented chart patch

* (fix): add consistent space
voron pushed a commit to dysnix/helm-charts that referenced this pull request Sep 5, 2018
* stable etcd chart: fixed deployment typo extra space in yamls. added optional tolerations to deployments. fixed restore pod, service label and selector mismatch

* fixed {{- end}} typos. changed restore operator app label to use `name` instead of `fullname`

* incremented chart patch

* (fix): add consistent space

Signed-off-by: voron <av@arilot.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants