-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
break dep on clientcmd in pkgs outside pkg oc #17357
break dep on clientcmd in pkgs outside pkg oc #17357
Conversation
@@ -0,0 +1,24 @@ | |||
package clientconfig |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not in pkg/cmd
I think that should die soon. pkg/client/cmd
perhaps.
@@ -27,7 +27,7 @@ func getOpenShiftClientEnvVars(options configapi.MasterConfig) ([]kapi.EnvVar, e | |||
if err != nil { | |||
return nil, err | |||
} | |||
return clientcmd.EnvVars( | |||
return clientconfig.EnvVars( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This appears to be the only caller. Move it locally.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually the entire getOpenShiftClientEnvVars
needs refactoring. Queue up an issue to tidy it up.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Opened issue to track this: #17397
2085686
to
b848907
Compare
dbb7ad0
to
27984fe
Compare
a9efe89
to
9d92673
Compare
9d92673
to
d832b50
Compare
d832b50
to
f9a11f3
Compare
/retest |
// currentMigrationRules returns a map that holds the history of recommended home directories used in previous versions. | ||
// Any future changes to RecommendedHomeFile and related are expected to add a migration rule here, in order to make | ||
// sure existing config files are migrated to their new locations properly. | ||
func CurrentMigrationRules() map[string]string { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do the commands using this care about migration rules? Which ones are they?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Our wrapper command for NewCmdConfig
calls cmdconfig.NewOpenShiftClientConfigLoadingRules, which in turn calls currentMigrationRules
07f93e4
to
3dda8b9
Compare
/test extended_clusterup |
cc @deads2k |
This patch is a part of pull/17356 - it aims to break all dependencies between packages outside of `pkg/oc` and the `clientcmd` package. To achieve this, this patch creates a new package containing only the functions and objects found in `clientcmd` that are needed by its dependents outside of the `pkg/oc` subtree. Once this is done, all of the remaining logic (which should only be used by packages within `pkg/oc` is moved to `pkg/oc/cli/util/clientcmd` by pull/17356). This change acknowledges the possibility of having dependents for `pkg/cmd/util/clientconfig` within the `pkg/oc` subtree.
4900fe4
to
213f9a8
Compare
/test extended_clusterup |
/retest |
/retest |
/test extended_clusterup |
/retest |
/test crio |
/retest |
@juanvallejo start writing up flake issues for the different e2e issues. |
extended_clusterup flaked on #17548 |
crio test flaked on #14898 - error talking to yum |
/retest |
/test extended_conformance_install |
/retest |
2 similar comments
/retest |
/retest |
/test all [submit-queue is verifying that this PR is safe to merge] |
@juanvallejo: The following test failed, say
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. |
Automatic merge from submit-queue. |
Automatic merge from submit-queue (batch tested with PRs 17536, 17512). prevent references from origin to oc Builds on #17516 and #17357 After this, oc can be deleted from origin during the next kube bump. @juanvallejo missed one. I hacked it in. You'll want to pretty it up eventually. @eparis @smarterclayton after this merges, I think we're good to branch 3.8.
This patch is a part of pull/17356 - it aims to break all dependencies
between packages outside of
pkg/oc
and theclientcmd
package.To achieve this, this patch creates a new package containing only the
functions and objects found in
clientcmd
that are needed by itsdependents outside of the
pkg/oc
subtree. Once this is done, all ofthe remaining logic (which should only be used by packages within
pkg/oc
is moved topkg/oc/cli/util/clientcmd
by pull/17356).This change acknowledges the possibility of having dependents for
pkg/cmd/util/clientconfig
within thepkg/oc
subtree.cc @deads2k @openshift/cli-review @liggitt