Skip to content

Bump openshift/api#359

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
Elbehery:bump-openshift-api
Jul 8, 2021
Merged

Bump openshift/api#359
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
Elbehery:bump-openshift-api

Conversation

@Elbehery
Copy link
Copy Markdown
Contributor

@Elbehery Elbehery commented Jun 30, 2021

This will allow us to get latest feature gates about CSI migration

Note: this is needed for CSI migration feature to work in OCP 4.9.
Goal of this PR is to apply CSIMigrationGCE and CSIMigrationAzureDisk
feature gates when the TechPreviewNoUpgrade featureSet is set by the user., which was introduced in openshift/api#957

@Elbehery
Copy link
Copy Markdown
Contributor Author

/assign @bertinatto
/assign @jsafrane

Copy link
Copy Markdown
Contributor

@damemi damemi left a comment

Choose a reason for hiding this comment

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

--- FAIL: TestCheckForFeatureGates (0.00s)
    --- FAIL: TestCheckForFeatureGates/techpreview (0.00s)
        targetconfigcontroller_test.go:331: missing in actual: map[]
        targetconfigcontroller_test.go:332: missing in expected: map[CSIMigrationAzureDisk:{} CSIMigrationGCE:{}]
        targetconfigcontroller_test.go:333: Expected map[APIPriorityAndFairness:true CSIDriverAzureDisk:true CSIDriverVSphere:true CSIMigrationAWS:true CSIMigrationOpenStack:true DownwardAPIHugePages:true LegacyNodeRoleBehavior:false NodeDisruptionExclusion:true RotateKubeletServerCertificate:true ServiceNodeExclusion:true SupportPodPidsLimit:true] feature gates to be present but found map[APIPriorityAndFairness:true CSIDriverAzureDisk:true CSIDriverVSphere:true CSIMigrationAWS:true CSIMigrationAzureDisk:true CSIMigrationGCE:true CSIMigrationOpenStack:true DownwardAPIHugePages:true LegacyNodeRoleBehavior:false NodeDisruptionExclusion:true RotateKubeletServerCertificate:true ServiceNodeExclusion:true SupportPodPidsLimit:true]
I0630 19:14:53.786472    9516 targetconfigcontroller.go:329] Error while listing features.config.openshift.io/cluster with featuregate.config.openshift.io "cluster" not found: so return default feature gates
I0630 19:14:53.817692    9516 targetconfigcontroller.go:329] Error while listing features.config.openshift.io/cluster with featuregate.config.openshift.io "cluster" not found: so return default feature gates
I0630 19:14:53.840505    9516 targetconfigcontroller.go:329] Error while listing features.config.openshift.io/cluster with featuregate.config.openshift.io "cluster" not found: so return default feature gates

The first part of this failure looks like you might need to update the test (as that default list of feature gates changes, what we expect also needs to update to match it, see for example edfb1a3)

Though the 2nd part ("cluster" not found) sounds like it could have just been due to an infra issue, so retesting to double check
/retest

@Elbehery Elbehery force-pushed the bump-openshift-api branch from c324976 to 1cbf29c Compare July 1, 2021 02:45
@ingvagabund
Copy link
Copy Markdown
Member

go mod vendor is required to be ran as well

@Elbehery
Copy link
Copy Markdown
Contributor Author

Elbehery commented Jul 1, 2021

go mod vendor is required to be ran as well

I have run go mod vendor && go mod tidy after updating the go.mod file

@ingvagabund
Copy link
Copy Markdown
Member

After running the command locally over your PR I get a diff:

$ git diff
diff --git a/vendor/modules.txt b/vendor/modules.txt
index ace16acd..085be036 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -94,7 +94,7 @@ github.com/modern-go/concurrent
 github.com/modern-go/reflect2
 # github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
 github.com/munnerz/goautoneg
-# github.com/openshift/api v0.0.0-20210521075222-e273a339932a => github.com/openshift/api v0.0.0-20210629145910-15a1cae1fca8
+# github.com/openshift/api v0.0.0-20210629145910-15a1cae1fca8 => github.com/openshift/api v0.0.0-20210629145910-15a1cae1fca8
 ## explicit
 github.com/openshift/api
 github.com/openshift/api/apiserver
@@ -988,5 +988,5 @@ sigs.k8s.io/structured-merge-diff/v4/typed
 sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.2.0
 sigs.k8s.io/yaml
-# k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99
 # github.com/openshift/api => github.com/openshift/api v0.0.0-20210629145910-15a1cae1fca8
+# k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99

@Elbehery
Copy link
Copy Markdown
Contributor Author

Elbehery commented Jul 1, 2021

After running the command locally over your PR I get a diff:

$ git diff
diff --git a/vendor/modules.txt b/vendor/modules.txt
index ace16acd..085be036 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -94,7 +94,7 @@ github.com/modern-go/concurrent
 github.com/modern-go/reflect2
 # github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
 github.com/munnerz/goautoneg
-# github.com/openshift/api v0.0.0-20210521075222-e273a339932a => github.com/openshift/api v0.0.0-20210629145910-15a1cae1fca8
+# github.com/openshift/api v0.0.0-20210629145910-15a1cae1fca8 => github.com/openshift/api v0.0.0-20210629145910-15a1cae1fca8
 ## explicit
 github.com/openshift/api
 github.com/openshift/api/apiserver
@@ -988,5 +988,5 @@ sigs.k8s.io/structured-merge-diff/v4/typed
 sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.2.0
 sigs.k8s.io/yaml
-# k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99
 # github.com/openshift/api => github.com/openshift/api v0.0.0-20210629145910-15a1cae1fca8
+# k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99

Thanks for your review, I have pushed a fix 👍🏽

@Elbehery Elbehery force-pushed the bump-openshift-api branch from 28b1bcd to f0b0ccf Compare July 1, 2021 14:00
@Elbehery
Copy link
Copy Markdown
Contributor Author

Elbehery commented Jul 1, 2021

/retest

@Elbehery Elbehery force-pushed the bump-openshift-api branch from f0b0ccf to 3cd9c0a Compare July 2, 2021 10:49
The goal of this bump is to apply `CSIMigrationGCE` and `CSIMigrationAzureDisk`
feature gates when the `TechPreviewNoUpgrade` featureSet is set by the user.
@Elbehery Elbehery force-pushed the bump-openshift-api branch from 3cd9c0a to 3dd3f69 Compare July 4, 2021 11:29
@Elbehery
Copy link
Copy Markdown
Contributor Author

Elbehery commented Jul 5, 2021

/retest

@Elbehery
Copy link
Copy Markdown
Contributor Author

Elbehery commented Jul 5, 2021

/assign @damemi
/assign @bertinatto

@bertinatto
Copy link
Copy Markdown
Member

/lgtm

/assign @damemi @ingvagabund
for approval

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 5, 2021
@ingvagabund
Copy link
Copy Markdown
Member

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 8, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto, Elbehery, ingvagabund

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:

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 8, 2021
@openshift-merge-robot openshift-merge-robot merged commit 81820e6 into openshift:master Jul 8, 2021
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants