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

Bug 1814290: Copy files from etcd-scripts to /usr/local/bin for convenience #265

Merged
merged 1 commit into from Mar 17, 2020
Merged

Bug 1814290: Copy files from etcd-scripts to /usr/local/bin for convenience #265

merged 1 commit into from Mar 17, 2020

Conversation

retroflexer
Copy link
Contributor

@retroflexer retroflexer commented Mar 16, 2020 •
edited

Copying the DR scripts from the unconventional etcd-scripts path to /usr/local/bin, so that the user can invoke it from anywhere.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 16, 2020
@retroflexer retroflexer force-pushed the add-links-to-scripts-in-usr-local-bin branch from dfe1e81 to eb5db1c Compare March 16, 2020 18:33
@retroflexer retroflexer changed the title [WIP]: Symoblic link files from etcd-scripts to /usr/local/bin for convenience [WIP]: Link files from etcd-scripts to /usr/local/bin for convenience Mar 16, 2020
hexfusion
hexfusion reviewed Mar 16, 2020
View reviewed changes
bindata/etcd/pod.yaml Outdated Show resolved Hide resolved
@retroflexer retroflexer force-pushed the add-links-to-scripts-in-usr-local-bin branch from eb5db1c to 9cfaaba Compare March 16, 2020 18:40
@retroflexer retroflexer changed the title [WIP]: Link files from etcd-scripts to /usr/local/bin for convenience [WIP]: Copy files from etcd-scripts to /usr/local/bin for convenience Mar 16, 2020
@retroflexer retroflexer force-pushed the add-links-to-scripts-in-usr-local-bin branch 2 times, most recently from be9f85d to 4fd880f Compare March 16, 2020 18:50
hexfusion
hexfusion reviewed Mar 16, 2020
View reviewed changes
bindata/etcd/etcd-member-remove.sh
@@ -1,5 +1,6 @@
#!/usr/bin/env bash

### Created by cluster-etcd-operator. DO NOT edit.
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe in the future, we should have the process add this string but not something we need today.

@retroflexer retroflexer force-pushed the add-links-to-scripts-in-usr-local-bin branch from 4fd880f to 549f4bf Compare March 16, 2020 19:08
@hexfusion
Copy link
Contributor

scripts come from bindata and you would need root to write so I think this is safe

$ ls -ld /etc/kubernetes/static-pod-resources
drwxr-xr-x. 26 root root 4096 Mar 16 17:15 /etc/kubernetes/static-pod-resources

@hexfusion
Copy link
Contributor

/retest

alaypatel07
alaypatel07 reviewed Mar 16, 2020
View reviewed changes
Copy link
Contributor

@alaypatel07 alaypatel07 left a comment

Choose a reason for hiding this comment

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

@retroflexer thanks for taking this, changes look good to me, will defer the tagging to @hexfusion

@alaypatel07
Copy link
Contributor

not sure what was the conclusion but are we adding conf file to this? https://github.com/openshift/cluster-etcd-operator/pull/265/files#diff-f19a648fa992d810479d30657e849c6dR126

@hexfusion
Copy link
Contributor

/retest

@retroflexer
Copy link
Contributor Author

not sure what was the conclusion but are we adding conf file to this? https://github.com/openshift/cluster-etcd-operator/pull/265/files#diff-f19a648fa992d810479d30657e849c6dR126

We decided not to continue carrying etcd.conf. Sam said: "It is not an issue FTR." on slack discussions.

@retroflexer
Copy link
Contributor Author

/retest

@sanchezl
Copy link
Contributor

/retest

2 similar comments
@hexfusion
Copy link
Contributor

/retest

@retroflexer
Copy link
Contributor Author

/retest

@retroflexer retroflexer changed the title [WIP]: Copy files from etcd-scripts to /usr/local/bin for convenience Copy files from etcd-scripts to /usr/local/bin for convenience Mar 17, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 17, 2020
@hexfusion
Copy link
Contributor

/skip
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 17, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 17, 2020
@hexfusion
Copy link
Contributor

/approve
/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 17, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hexfusion, retroflexer, sanchezl

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

@hexfusion
Copy link
Contributor

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 17, 2020
@hexfusion
Copy link
Contributor

/refresh

@openshift-ci-robot
Copy link

@retroflexer: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-azure 549f4bf link /test e2e-azure

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit da18363 into openshift:master Mar 17, 2020
@hexfusion
Copy link
Contributor

/cherrypick release-4.4

@openshift-cherrypick-robot
Copy link

@hexfusion: #265 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	bindata/etcd/etcd-snapshot-restore.sh
M	bindata/etcd/pod.yaml
M	pkg/operator/etcd_assets/bindata.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/etcd_assets/bindata.go
CONFLICT (content): Merge conflict in pkg/operator/etcd_assets/bindata.go
Auto-merging bindata/etcd/pod.yaml
CONFLICT (content): Merge conflict in bindata/etcd/pod.yaml
Auto-merging bindata/etcd/etcd-snapshot-restore.sh
Patch failed at 0001 Symoblic link files from etcd-scripts to /usr/local/bin for convenient path

In response to this:

/cherrypick release-4.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@retroflexer retroflexer changed the title Copy files from etcd-scripts to /usr/local/bin for convenience Bug 1814290: Copy files from etcd-scripts to /usr/local/bin for convenience Mar 17, 2020
@openshift-ci-robot
Copy link

@retroflexer: All pull requests linked via external trackers have merged. Bugzilla bug 1814290 has been moved to the MODIFIED state.

In response to this:

Bug 1814290: Copy files from etcd-scripts to /usr/local/bin for convenience

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@retroflexer
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot
Copy link

@retroflexer: Bugzilla bug 1814290 is in an unrecognized state (MODIFIED) and will not be moved to the MODIFIED state.

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@hexfusion
Copy link
Contributor

/cherrypick release-4.4

@openshift-cherrypick-robot
Copy link

@hexfusion: #265 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	bindata/etcd/etcd-snapshot-restore.sh
M	bindata/etcd/pod.yaml
M	pkg/operator/etcd_assets/bindata.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/etcd_assets/bindata.go
CONFLICT (content): Merge conflict in pkg/operator/etcd_assets/bindata.go
Auto-merging bindata/etcd/pod.yaml
CONFLICT (content): Merge conflict in bindata/etcd/pod.yaml
Auto-merging bindata/etcd/etcd-snapshot-restore.sh
Patch failed at 0001 Symoblic link files from etcd-scripts to /usr/local/bin for convenient path

In response to this:

/cherrypick release-4.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@retroflexer retroflexer mentioned this pull request Mar 17, 2020
Closed
@hexfusion hexfusion mentioned this pull request Mar 17, 2020
Merged
@retroflexer retroflexer deleted the add-links-to-scripts-in-usr-local-bin branch June 1, 2021 23:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hexfusion hexfusion hexfusion left review comments

@alaypatel07 alaypatel07 alaypatel07 left review comments

@sanchezl sanchezl sanchezl approved these changes

@mfojtik mfojtik Awaiting requested review from mfojtik

Assignees

@hexfusion hexfusion

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@retroflexer @hexfusion @alaypatel07 @sanchezl @openshift-ci-robot @openshift-cherrypick-robot @openshift-merge-robot