Skip to content
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

Bump k8s.io/* deps to 1.28 #1920

Merged
merged 3 commits into from
Sep 29, 2023

Conversation

afritzler
Copy link
Contributor

What this PR does / why we need it:

  • Bump k8s.io/* deps to 1.28
  • Fix metrics bind address assignment in manager setup
  • Rename metrics-port flag to webhook-server-port as it was wrongly used

Checklist:

  • Docs included if any changes are user facing

Copy link
Member

@andreyvelich andreyvelich left a comment

Choose a reason for hiding this comment

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

Thank you for updating this @afritzler!
/assign @kubeflow/wg-training-leads @tenzen-y

Makefile Outdated
@@ -62,7 +62,7 @@ ifeq ($(GOLANGCI_LINT),)
endif
golangci-lint run --timeout 5m --go 1.20 ./...

ENVTEST_K8S_VERSION ?= 1.27
ENVTEST_K8S_VERSION ?= 1.28
Copy link
Member

Choose a reason for hiding this comment

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

Do we want to use 1.28 or 1.27 k8s version since our E2Es are set to run on 1.25, 1.26, and 1.27 version: https://github.com/kubeflow/training-operator/blob/master/.github/workflows/integration-tests.yaml#L50 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fair enough I reverted it back to 1.27.

k8s.io/klog/v2 v2.90.1
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
k8s.io/klog/v2 v2.100.1
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
Copy link
Member

Choose a reason for hiding this comment

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

I am wondering do we really need separate go.mod file for Swagger ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I actually didn't plan to touch this part as I wanted to keep the structure as is.

Comment on lines 84 to 87
flag.IntVar(&monitoringPort, "monitoring-port", 9443, "Endpoint port for displaying monitoring metrics. "+
"It can be set to \"0\" to disable the metrics serving.")
flag.IntVar(&webhookServerPort, "webhook-server-port", 9443, "Endpoint port for the webhook server.")
Copy link
Member

Choose a reason for hiding this comment

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

This is a bug and breaking change. So, can you open another PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reverted the flag to the old one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure that this is a bug, because the old Port field was actually the webhook server port and not the monitoring port. Anyways the behaviour should be the same again and needs to be addressed separately.

Copy link
Member

Choose a reason for hiding this comment

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

Not sure that this is a bug, because the old Port field was actually the webhook server port and not the monitoring port.

Correct. I meant that removing the existing flag is breaking changes. So we should work on the breaking change at separate PR.

Copy link
Member

@tenzen-y tenzen-y left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@google-oss-prow
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afritzler, tenzen-y

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

The pull request process is described here

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

@tenzen-y
Copy link
Member

/hold

@tenzen-y
Copy link
Member

@kubeflow/wg-training-leads Could you approve CI?

@afritzler
Copy link
Contributor Author

Looks like some of the integration tests are running out of disk space in the GH runner. 🥴

@tenzen-y
Copy link
Member

Looks like some of the integration tests are running out of disk space in the GH runner. 🥴

@afritzler I fixed the issue in another PR. So can you rebase this PR?

- Bump k8s.io/* deps to 1.28
- Fix metrics bind address assignment in manager setup
- Rename metrics-port flag to webhook-server-port as it was wrongly used
- Revert envtest to 1.27
- Use generate-groups.sh instead of kube_codegen.sh
@afritzler
Copy link
Contributor Author

Looks like some of the integration tests are running out of disk space in the GH runner. 🥴

@afritzler I fixed the issue in another PR. So can you rebase this PR?

Thx & done!

@tenzen-y
Copy link
Member

/lgtm
/hold cancel
@kubeflow/wg-training-leads Could you approve CI again?

@google-oss-prow google-oss-prow bot merged commit f7e2b83 into kubeflow:master Sep 29, 2023
1 check passed
@tenzen-y
Copy link
Member

Oops. Before approving CI, this PS seems to been merged 😞

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants