Bug 1904713: Fix issue getting kubernetes cluster version from API Server.

[akashshinde]

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1904713

[openshift-ci-robot]

@akashshinde: This pull request references Bugzilla bug 1904713, 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 1904713: Fix issue getting kubernetes cluster version from API Server.

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]

@akashshinde: This pull request references Bugzilla bug 1904713, which is valid.

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 POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Details

In response to this:

Bug 1904713: Fix issue getting kubernetes cluster version from API Server.

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.

[akashshinde]

@pedjak @spadgett Please review this

[pedjak]

The fix does not solve a situation when an error happen at console bootstrap and we are not able to get the cluster version. In that case the filtering will be practically turned off.

IMHO, it would be more robust to try to read the cluster version at the moment when it is really needed (lazy, at the first index.yaml call). If we get the error then, we are going to deliver unfiltered index.yaml, but we will try to get the version by the next call, until we finally get it.

Please provide a better commit message and PR description explaining how the fix solves the issue.

[pedjak]

/cherry-pick release-4.6

[openshift-cherrypick-robot]

@pedjak: once the present PR merges, I will cherry-pick it on top of release-4.6 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.6

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.

[akashshinde]

/retest

[akashshinde]

/retest

[spadgett]

/approve

I will defer to @pedjak for the code review, thanks!

[akashshinde]

@spadgett Please review cc: @pedjak

[pedjak]

@rohitkrai03 can you test it?

[rohitkrai03]

@pedjak @akashshinde I tried the PR with a cluster built using cluster-bot. On the cluster I am seeing only 6 helm charts in the catalog while on a nightly cluster i am getting 9 helm charts in the catalog. It seems that it is filtering helm charts that it shouldn’t. I checked the chart getting filtered had a kubeVersion specified with a -0 in it.

Nightly Cluster -

PR cluster -

[rohitkrai03]

Had a discussion with @akashshinde around the filtering. The PR cluster was filtering charts because it was running pre-release kubernetes version and the nightly cluster was showing all 9 charts because it was running stable kubernetes version. The filtering seems to be working correctly based on that.

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: akashshinde, rohitkrai03, spadgett

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:

• OWNERS [spadgett]

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

[pedjak]

/retest

[openshift-ci-robot]

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

• openshift/console#7548

Bugzilla bug 1904713 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1904713: Fix issue getting kubernetes cluster version from API Server.

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-cherrypick-robot]

@pedjak: #7548 failed to apply on top of branch "release-4.6":

Applying: Fix issue getting kubernetes cluster version from API Server
Using index info to reconstruct a base tree...
A	pkg/helm/actions/kube_version.go
M	pkg/helm/chartproxy/proxy.go
M	pkg/helm/chartproxy/proxy_test.go
M	pkg/helm/handlers/handlers.go
M	pkg/server/server.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/server/server.go
CONFLICT (content): Merge conflict in pkg/server/server.go
Auto-merging pkg/helm/handlers/handlers.go
CONFLICT (content): Merge conflict in pkg/helm/handlers/handlers.go
Auto-merging pkg/helm/chartproxy/proxy_test.go
CONFLICT (content): Merge conflict in pkg/helm/chartproxy/proxy_test.go
Auto-merging pkg/helm/chartproxy/proxy.go
CONFLICT (content): Merge conflict in pkg/helm/chartproxy/proxy.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix issue getting kubernetes cluster version from API Server
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.6

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]

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

Test name	Commit	Details	Rerun command
ci/prow/kubevirt-plugin	ed6a1e419ee3cc506144860451cf00e5949e6303	link	/test kubevirt-plugin
ci/prow/frontend	a292ce9	link	/test frontend
ci/prow/e2e-gcp-console	a292ce9	link	/test e2e-gcp-console

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.