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.

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

etcd-manager: set environment variables once #15516

Merged
merged 2 commits into from
Jun 22, 2023

Conversation

justinsb
Copy link
Member

Previously we were setting the env variable up to 3 times in an HA
control-plane, because we were adding to the etcd-manager
configuration once for each replica.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 18, 2023
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 18, 2023
@justinsb
Copy link
Member Author

See (for example) the tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data output, where the env var is repeated 3 times.

One thing I'm not sure of, is whether we want this to appear once in the data files we write. I think it's superfluous because we have the backupRetentionDays: 90 as well. But if we wanted to it wouldn't be too hard to just scan for duplicate env vars and simply remove them. This is only a cleanup - I don't think it breaks anything to specify the env var 3 times - so maybe that is the more defensive-coding approach?

cc @hakman

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 21, 2023
Previously we were setting the env variable up to 3 times in an HA
control-plane, because we were adding to the etcd-manager
configuration once for each replica.
@hakman hakman force-pushed the etcd_manager_env_var_once branch from acb17d2 to 5abb7af Compare June 22, 2023 14:18
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 22, 2023
@hakman
Copy link
Member

hakman commented Jun 22, 2023

/retest

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 22, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 22, 2023
@k8s-triage-robot
Copy link

The Kubernetes project has merge-blocking tests that are currently too flaky to consistently pass.

This bot retests PRs for certain kubernetes repos according to the following rules:

  • The PR does have any do-not-merge/* labels
  • The PR does not have the needs-ok-to-test label
  • The PR is mergeable (does not have a needs-rebase label)
  • The PR is approved (has cncf-cla: yes, lgtm, approved labels)
  • The PR is failing tests required for merge

You can:

/retest

@hakman
Copy link
Member

hakman commented Jun 22, 2023

/test all

@k8s-ci-robot k8s-ci-robot merged commit d3cc463 into kubernetes:master Jun 22, 2023
23 checks passed
k8s-ci-robot added a commit that referenced this pull request Jun 30, 2023
…-upstream-release-1.27

Automated cherry pick of #15516: etcd-manager: set environment variables once
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. kind/office-hours lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants