-
Notifications
You must be signed in to change notification settings - Fork 4.8k
USHIFT-355: MicroShift: skip sig-network tests #27428
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
Conversation
test/extended/util/framework.go
Outdated
|
|
||
| var ( | ||
| microShiftVersion string | ||
| microShiftMutex sync.Mutex |
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.
What is this protecting against?
d12069a to
32ae026
Compare
|
/hold |
32ae026 to
9f3ba3c
Compare
|
/unhold |
test/extended/idling/idling.go
Outdated
| }) | ||
|
|
||
| g.Describe("Unidling", func() { | ||
| g.Describe("Unidling [apigroup:apps.openshift.io]", func() { |
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.
route.openshift.io as well (both apps and route are used in testdata/idling-echo-server.yaml (set through echoServerFixture)
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.
Also with a single service and DeploymentConfig (line 218) is using route.openshift.io (through testdata/idling-echo-server-rc.yaml)
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.
Done
test/extended/router/stress.go
Outdated
| }, metav1.CreateOptions{}) | ||
| } | ||
|
|
||
| _, err = oc.AdminKubeClient().RbacV1().RoleBindings(ns).Create(context.Background(), roleBinding, metav1.CreateOptions{}) |
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.
Why this change when roleBinding is used only once?
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.
Leftover from previous change.
test/extended/util/framework.go
Outdated
| } | ||
|
|
||
| func FindRouterImage(oc *CLI) (string, error) { | ||
| microShift, err := IsMicroShiftDeployment(oc) |
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.
Leftover? IsMicroShiftDeployment is never defined.
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.
Done
9f3ba3c to
0feb162
Compare
| return "", err | ||
| } | ||
| if !exists { | ||
| deployment, err := oc.AdminKubeClient().AppsV1().Deployments("openshift-ingress").Get(context.Background(), "router-default", metav1.GetOptions{}) |
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.
In 4.12 taking deployment.Spec.Template.Spec.Containers[0].Image from the deployment gets me quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a955bf1686fcb4f11cd23880be6025c2dc75252d318931211554be86f4f5d0f1. Taking .Status.Versions[*].Version from clusteroperator/ingress I get quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a955bf1686fcb4f11cd23880be6025c2dc75252d318931211554be86f4f5d0f1. @pacevedom is it always guaranteed the images will be identical?
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.
@openshift/networking can you confirm accessing deployment.Spec.Template.Spec.Containers[0].Image of router-default deployment gets the same image as from the ingress clusteroperator object? Resp. is this acceptable alternative?
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.
Yes, deployment.Spec.Template.Spec.Containers[0].Image of the openshift-ingress/router-default deployment on both MicroShift and standard OpenShift is the same image as the "ingress-controller" image in the ingress clusteroperator on standard OpenShift. This approach looks reasonable.
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 is output from a 4.12 cluster:
$ oc get deployment -n openshift-ingress router-default -o jsonpath='{.spec.template.spec.containers[*].image}'
quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72c751aa148bf498839e6f37b304e3265f85af1e00578e637332a13ed9545ece
$ oc get clusteroperator ingress -o jsonpath='{.status.versions[?(@.name=="ingress-controller")].version}'
quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72c751aa148bf498839e6f37b304e3265f85af1e00578e637332a13ed9545ece
router-default is MicroShift equivalent for ingress-controller pod in OCP.
|
/lgtm |
soltysh
left a comment
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.
/approve
|
/retest-required |
|
/retest-required |
|
/hold Revision 0feb162 was retested 3 times: holding |
|
/unhold |
|
/retest-required |
0feb162 to
04103fc
Compare
| { | ||
| name: "basic", | ||
| testLine: "ok package/name 0.160s", | ||
| name: "basic", |
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.
Looks like this is formatted with go1.18. @pacevedom the codebase has been recently formatted with go1.19.
04103fc to
153f716
Compare
153f716 to
f334707
Compare
|
/lgtm |
f334707 to
8d9355e
Compare
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ingvagabund, pacevedom, soltysh The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest-required |
|
@pacevedom: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
|
|
Merged through #27498 |
|
@pacevedom: PR needs rebase. DetailsInstructions 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. |
|
/close |
|
@ingvagabund: Closed this PR. DetailsIn response to this:
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. |
No description provided.