Bug 1907947: cloud-creds-secret creation with current context info only #4484

nirarg · 2020-12-15T15:26:27Z

No description provided.

openshift-ci-robot · 2020-12-15T15:26:37Z

@nirarg: This pull request references Bugzilla bug 1907947, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Details

In response to this:

Bug 1907947: cloud-creds-secret creation with current context info only

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.

nirarg · 2020-12-15T15:29:09Z

Hi @staebler ,
This PR is related to this comment: #4350 (comment)

openshift-merge-robot · 2020-12-15T19:43:13Z

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

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-upgrade	5e1961207f249edc4a9e420246b351f55f7a319d	link	`/test e2e-aws-upgrade`
ci/prow/e2e-crc	5e1961207f249edc4a9e420246b351f55f7a319d	link	`/test e2e-crc`
ci/prow/e2e-aws-workers-rhel7	5e1961207f249edc4a9e420246b351f55f7a319d	link	`/test e2e-aws-workers-rhel7`
ci/prow/e2e-ovirt	5e1961207f249edc4a9e420246b351f55f7a319d	link	`/test e2e-ovirt`

Full PR test history. Your PR dashboard.

Details

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.

staebler

Looks good. Just some nits.

/approve

staebler · 2020-12-18T22:38:41Z

pkg/asset/installconfig/kubevirt/client.go

Suggested change

var currentContextValue *clientcmdapi.Context

for k, v := range rawConfig.Contexts {

if k != rawConfig.CurrentContext {

delete(rawConfig.Contexts, k)

} else {

currentContextValue = v

}

}

if currentContextValue == nil {

return nil, fmt.Errorf("currentContext is not included in rawConfig.Contexts")

}

currentContextValue := rawConfig.Contexts[rawConfig.CurrentContext]

if currentContextValue == nil {

return nil, fmt.Errorf("currentContext is not included in rawConfig.Contexts")

}

rawConfig.Contexts = map[string]*clientcmdapi.Context{

rawConfig.CurrentContext: currentContextValue,

}

staebler · 2020-12-18T22:41:42Z

pkg/asset/installconfig/kubevirt/client.go

Suggested change

for k := range rawConfig.Clusters {

if k != currentContextValue.Cluster {

delete(rawConfig.Clusters, k)

}

}

if v, ok := rawConfig.Clusters[currentContextValue.Cluster]; ok {

rawConfig.Clusters = map[string]*clientcmdapi.Cluster{

currentContextValue.Cluster: v

}

}

Do a similar thing for AuthInfos, as well.

openshift-ci-robot · 2020-12-18T22:44:36Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~pkg/asset/installconfig/kubevirt/OWNERS~~ [staebler]

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

…e anything that is not related to the current context from the result rawConfig

nirarg · 2020-12-20T12:50:12Z

/retest

chenyosef · 2020-12-20T12:50:28Z

/lgtm

openshift-bot · 2020-12-20T14:23:30Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-12-20T15:36:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2020-12-20T15:54:01Z

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

Test name	Commit	Details	Rerun command
ci/prow/e2e-crc	`c45442e`	link	`/test e2e-crc`

Full PR test history. Your PR dashboard.

Details

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-bot · 2020-12-20T16:54:30Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci-robot · 2020-12-20T17:32:06Z

@nirarg: All pull requests linked via external trackers have merged:

openshift/installer#4484

Bugzilla bug 1907947 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1907947: cloud-creds-secret creation with current context info only

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.

openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Dec 15, 2020

openshift-ci-robot requested review from bardielle and chenyosef December 15, 2020 15:26

staebler reviewed Dec 18, 2020

View reviewed changes

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 18, 2020

When saving kubeconfig in openshift/99_cloud-creds-secret.yaml, remov…

c45442e

…e anything that is not related to the current context from the result rawConfig

nirarg force-pushed the kubevirt-cloud-creds-secret branch from 5e19612 to c45442e Compare December 20, 2020 10:57

openshift-ci-robot assigned chenyosef Dec 20, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 20, 2020

openshift-merge-robot merged commit 6abb3b5 into openshift:master Dec 20, 2020

nirarg deleted the kubevirt-cloud-creds-secret branch December 27, 2020 07:07

-	var currentContextValue *clientcmdapi.Context
-	for k, v := range rawConfig.Contexts {
-		if k != rawConfig.CurrentContext {
-			delete(rawConfig.Contexts, k)
-		} else {
-			currentContextValue = v
-		}
-	}
-	if currentContextValue == nil {
-		return nil, fmt.Errorf("currentContext is not included in rawConfig.Contexts")
-	}
+	currentContextValue := rawConfig.Contexts[rawConfig.CurrentContext]
+	if currentContextValue == nil {
+		return nil, fmt.Errorf("currentContext is not included in rawConfig.Contexts")
+	}
+	rawConfig.Contexts = map[string]*clientcmdapi.Context{
+		rawConfig.CurrentContext: currentContextValue,
+	}

-	for k := range rawConfig.Clusters {
-		if k != currentContextValue.Cluster {
-			delete(rawConfig.Clusters, k)
-		}
-	}
+	if v, ok := rawConfig.Clusters[currentContextValue.Cluster]; ok {
+		rawConfig.Clusters = map[string]*clientcmdapi.Cluster{
+			currentContextValue.Cluster: v
+		}
+	}

Bug 1907947: cloud-creds-secret creation with current context info only #4484

Bug 1907947: cloud-creds-secret creation with current context info only #4484

Uh oh!

Conversation

nirarg commented Dec 15, 2020

Uh oh!

openshift-ci-robot commented Dec 15, 2020

Uh oh!

nirarg commented Dec 15, 2020

Uh oh!

openshift-merge-robot commented Dec 15, 2020

Uh oh!

staebler left a comment

Choose a reason for hiding this comment

Uh oh!

staebler Dec 18, 2020

Choose a reason for hiding this comment

Uh oh!

nirarg Dec 20, 2020

Choose a reason for hiding this comment

Uh oh!

staebler Dec 18, 2020

Choose a reason for hiding this comment

Uh oh!

nirarg Dec 20, 2020

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Dec 18, 2020

Uh oh!

nirarg commented Dec 20, 2020

Uh oh!

chenyosef commented Dec 20, 2020

Uh oh!

openshift-bot commented Dec 20, 2020

Uh oh!

openshift-bot commented Dec 20, 2020

Uh oh!

openshift-ci bot commented Dec 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-bot commented Dec 20, 2020

Uh oh!

openshift-ci-robot commented Dec 20, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

openshift-ci bot commented Dec 20, 2020 •

edited

Loading