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

Merge 1.57.3 from upstream #50

Merged
merged 56 commits into from
Oct 25, 2023
Merged

Merge 1.57.3 from upstream #50

merged 56 commits into from
Oct 25, 2023

Conversation

ovstuckrad
Copy link

What this PR does / why we need it:

Merge upstream tag 1.57.3

ahmedwaleedmalik and others added 30 commits February 15, 2023 14:14
* Always use latest OSM image in e2e tests

Signed-off-by: Waleed Malik <[email protected]>

* Update k8s versions for e2e tests

Signed-off-by: Waleed Malik <[email protected]>

---------

Signed-off-by: Waleed Malik <[email protected]>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.4.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.4.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Add machine_controller_provisioning_time_seconds bucket
Add machine_controller_deprovisioning_time_seconds bucket

Signed-off-by: Manuel Zangl <[email protected]>
* support private ip for hetzner cloud

Signed-off-by: Moath Qasim <[email protected]>

* document hetzner ips assignment

Signed-off-by: Moath Qasim <[email protected]>

* fix linting

Signed-off-by: Moath Qasim <[email protected]>

---------

Signed-off-by: Moath Qasim <[email protected]>
…bermatic#1591)

* adjust VPC to the new one after we recently switched AWS accounts

* fix misleading documentation
* Fix E2E tests for VMware Cloud Director

Signed-off-by: Waleed Malik <[email protected]>

* Compute and pull latest image for OSM in CI

Signed-off-by: Waleed Malik <[email protected]>

---------

Signed-off-by: Waleed Malik <[email protected]>
* validate the AWS VPC has DNS hostnames enabled

* lint

* try different RHEL AMI
* Upgrade to Go 1.20.2

Signed-off-by: Waleed Malik <[email protected]>

* Remove package updates

Signed-off-by: Waleed Malik <[email protected]>

* Fix e2e tests for VCD

Signed-off-by: Waleed Malik <[email protected]>

---------

Signed-off-by: Waleed Malik <[email protected]>
…c#1612)

* API token authentication support for VMware Cloud Director

Signed-off-by: Waleed Malik <[email protected]>

* Refactored code

Signed-off-by: Waleed Malik <[email protected]>

---------

Signed-off-by: Waleed Malik <[email protected]>
* Use OSM with Anexia E2E tests

Signed-off-by: Waleed Malik <[email protected]>

* Always pull latest image for OSM

Signed-off-by: Waleed Malik <[email protected]>

* Compute image for OSM

Signed-off-by: Waleed Malik <[email protected]>

* Hardcode the OSP name for Anexia

Signed-off-by: Waleed Malik <[email protected]>

* Refactored code

Signed-off-by: Waleed Malik <[email protected]>

* Make Anexia E2E tests optional

Signed-off-by: Waleed Malik <[email protected]>

---------

Signed-off-by: Waleed Malik <[email protected]>
* refactor gcp client creating
Signed-off-by: Moath Qasim <[email protected]>

Signed-off-by: Moath Qasim <[email protected]>

* addressing pr reviews
Signed-off-by: Moath Qasim <[email protected]>

Signed-off-by: Moath Qasim <[email protected]>

---------

Signed-off-by: Moath Qasim <[email protected]>
* add logging bootstrapping

* replace klog everywhere in the controllers
* replace unsupported github.com/coreos/container-linux-config-transpile with its supported equivalent

* update fixtures
* Support for Kubernetes v1.27

Signed-off-by: Waleed Malik <[email protected]>

* Update build image

Signed-off-by: Waleed Malik <[email protected]>

* Update go dependencies and re-generate fixture data

Signed-off-by: Waleed Malik <[email protected]>

* Refactored code

Signed-off-by: Waleed Malik <[email protected]>

* Skip unsupported in-tree tests for AWS and OpenStack

Signed-off-by: Waleed Malik <[email protected]>

* Refactored code

Signed-off-by: Waleed Malik <[email protected]>

* Adjust spot pricing and tests

Signed-off-by: Waleed Malik <[email protected]>

---------

Signed-off-by: Waleed Malik <[email protected]>
xrstf and others added 25 commits May 4, 2023 08:01
* relax CSR validation to support Kubernetes 1.27

* adjust unit tests
* add cloud provider for opennebula

Signed-off-by: Georg Gadinger <[email protected]>

* use a flatcar image in example opennebula machinedeployment

Signed-off-by: Georg Gadinger <[email protected]>

* opennebula: update function signatures to include logger

Signed-off-by: Georg Gadinger <[email protected]>

* opennebula: update after review

Signed-off-by: Georg Gadinger <[email protected]>

* opennebula: add SET_HOSTNAME to context

Signed-off-by: Georg Gadinger <[email protected]>

* opennebula: fix lints

Signed-off-by: Georg Gadinger <[email protected]>

---------

Signed-off-by: Georg Gadinger <[email protected]>
* Add DNS servers to vm definition

Signed-off-by: Manuel Zangl <[email protected]>

* Add ProviderConfig to reconcileContext

Signed-off-by: Manuel Zangl <[email protected]>

* Test dns config

Signed-off-by: Manuel Zangl <[email protected]>

---------

Signed-off-by: Manuel Zangl <[email protected]>
Bumps [github.com/docker/distribution](https://github.com/docker/distribution) from 2.8.1+incompatible to 2.8.2+incompatible.
- [Release notes](https://github.com/docker/distribution/releases)
- [Commits](distribution/distribution@v2.8.1...v2.8.2)

---
updated-dependencies:
- dependency-name: github.com/docker/distribution
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Deprecate user data plugins

Signed-off-by: Waleed Malik <[email protected]>

* Refactored code

Signed-off-by: Waleed Malik <[email protected]>

---------

Signed-off-by: Waleed Malik <[email protected]>
* add documentation for community providers

Signed-off-by: Marvin Beckers <[email protected]>

* correct note about CentOS 7 and Rocky Linux 8

Signed-off-by: Marvin Beckers <[email protected]>

---------

Signed-off-by: Marvin Beckers <[email protected]>
* Check if providerConfig is set

Add test for empty network provider config

Signed-off-by: Manuel Zangl <[email protected]>

* Refactor provision vm test cases

Create test cases to reduce code duplication
Move common types and functions to helper_test

Signed-off-by: Manuel Zangl <[email protected]>

---------

Signed-off-by: Manuel Zangl <[email protected]>
* Run VMs with run strategy 'Once'

Signed-off-by: Marcin Franczyk <[email protected]>

* Fix KubeVirt unit tests

Signed-off-by: Marcin Franczyk <[email protected]>

* Allow external CCMs to handle node objects before MC.

Otherwise we have a race condition between MC and CCM.
Both try to check status of instances at cloud provider.
If MC reconciles instances first then kubelet will reuse the old node object
which is problematic in case of IP change.

Signed-off-by: Marcin Franczyk <[email protected]>

* Update doc of handleNodeFailuresWithExternalCCM func

Signed-off-by: Marcin Franczyk <[email protected]>

* Use ceph instead of portworx for KubeVirt tests

Signed-off-by: Marcin Franczyk <[email protected]>

---------

Signed-off-by: Marcin Franczyk <[email protected]>
* Add vmware anti-affinity for machins

* fix linting

* add to test

* fix comments and add validation

* query cluster if required for validation

* fix test cluster name

* increase timeout and move update call after vm is deleted
* Update golang outside .prow dir

* Update golang in verify.yaml

* Update golang inside .prow dir
Signed-off-by: Waleed Malik <[email protected]>
Co-authored-by: Waleed Malik <[email protected]>
Signed-off-by: Artiom Diomin <[email protected]>
Co-authored-by: Artiom Diomin <[email protected]>
pkg/cloudprovider/provider/openstack/provider.go Outdated Show resolved Hide resolved
pkg/cloudprovider/provider/openstack/provider.go Outdated Show resolved Hide resolved
if err != nil {
return err
}

// Watch for changes to MachineSet.
err = c.Watch(
&source.Kind{Type: &clusterv1alpha1.MachineSet{}},
&util.EnqueueRequestForObjectExceptDelete{},
&handler.EnqueueRequestForObject{},
Copy link
Member

Choose a reason for hiding this comment

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

I think we should keep our code here (util. EnqueueRequestForObjectExceptDelete), otherwise ba796dd will be undone.

pkg/controller/machinedeployment/controller.go Outdated Show resolved Hide resolved
@ovstuckrad ovstuckrad merged commit f77134d into master Oct 25, 2023
4 checks passed
@ovstuckrad ovstuckrad deleted the K8s-8779_merge-1.57.3 branch October 25, 2023 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.