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
Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
61c4e78
Always use latest OSM image in e2e tests (#1561)
ahmedwaleedmalik Feb 15, 2023
f0130c9
Use AWS spot instances for tests that always run (#1565)
ahmedwaleedmalik Feb 20, 2023
3ca5c41
Add providerID support for cloud providers (#1568)
ahmedwaleedmalik Feb 20, 2023
1176b4c
Add basic support for vultr cloud provider (#1531)
2000yeshu Feb 20, 2023
c099bf2
Bump golang.org/x/net from 0.4.0 to 0.7.0 (#1566)
dependabot[bot] Feb 20, 2023
085dfeb
Increase default timeout for OpenStack provider (#1570)
ahmedwaleedmalik Feb 22, 2023
d710662
Add metrics for provisioning nodes (#1572)
eiabea Feb 22, 2023
e80f611
Postpone machine cleanup when instance is still being created (#1571)
Feb 23, 2023
b63dfa1
Support Private IP for Hetzner Cloud (#1579)
moadqassem Feb 28, 2023
ce45ab9
adjust VPC to the new one after we recently switched AWS accounts (#1…
xrstf Mar 14, 2023
20b44fb
do not cache cancelled/timed out validations (#1593)
xrstf Mar 14, 2023
523298e
store MC/OSM logs as artifacts during E2E tests (#1594)
xrstf Mar 14, 2023
ee0d1cd
reduce default log level to prevent credentials from leaking (#1597)
xrstf Mar 23, 2023
4d09804
Anexia Provider: fix failed vm deletion deadlock (#1600)
Mar 27, 2023
2832465
Fix E2E tests for VMware Cloud Director (#1601)
ahmedwaleedmalik Mar 27, 2023
d054e61
Validate the AWS VPC has DNS hostnames enabled (#1590)
xrstf Mar 27, 2023
9470059
remove custom AMI from rhel os (#1607)
moadqassem Mar 28, 2023
09b7c7d
Fix vSphere e2e tests (#1608)
ahmedwaleedmalik Mar 28, 2023
0c507dd
Upgrade to Go 1.20.2 (#1584)
ahmedwaleedmalik Mar 28, 2023
e62960d
initialize iscsi if cloudprovider is Nutanix (#1596)
lucakuendig Mar 28, 2023
0598624
API token authentication support for VMware Cloud Director (#1612)
ahmedwaleedmalik Apr 3, 2023
4ec7ddf
Use OSM with Anexia E2E tests (#1582)
ahmedwaleedmalik Apr 5, 2023
dc7a8a2
Update Golang version to 1.20.3 (#1614)
pkprzekwas Apr 6, 2023
51e7170
fix not found check: errors.As for type match whereas errors.Is for v…
furkhat Apr 6, 2023
dd2680d
Refactor gcp client creating (#1613)
moadqassem Apr 9, 2023
052a4ca
Use zap instead of klog (#1606)
xrstf Apr 20, 2023
81db2c0
Use eu-central-1b for AWS arm tests (#1621)
embik Apr 25, 2023
c862e2f
update container linux config transpiler (#1611)
mate4st Apr 26, 2023
39e6eaf
Synchronize OWNERS_ALIASES file with Github teams (#1624)
kubermatic-bot Apr 29, 2023
a8f4e0f
Support for Kubernetes v1.27 (#1623)
ahmedwaleedmalik May 3, 2023
0ee7860
fix missing formatting in log line (#1628)
xrstf May 4, 2023
fdd3c56
relax CSR validation to support Kubernetes 1.27 (#1629)
xrstf May 5, 2023
c92595c
Add support for OpenNebula as a cloud provider (#1450)
nilsding May 5, 2023
28ee3c0
Update Go to 1.20.4 (#1633)
xmudrii May 10, 2023
b9a1fcc
Anexia Provider: Configure dns servers (#1637)
eiabea May 11, 2023
bc2e86d
remove DisableStrictZoneCheck from AWS 1.27 cloud-config (#1638)
xrstf May 11, 2023
571a7b7
E2E: Fix configuration for spot instances on AWS (#1643)
ahmedwaleedmalik May 12, 2023
c998d90
Bump github.com/docker/distribution (#1639)
dependabot[bot] May 12, 2023
d0f4672
Deprecate user data plugins (#1642)
ahmedwaleedmalik May 12, 2023
8e58848
Switch to cert-manager for certificates (#1644)
ahmedwaleedmalik May 16, 2023
79bc81b
Add documentation for community providers (#1631)
embik May 26, 2023
28336b0
Fix empty network config handling (#1646)
eiabea May 30, 2023
bfd2fd7
Allow external CCMs to handle node objects before MC (#1645)
mfranczy Jun 1, 2023
2fefe6e
Add vmware anti-affinity for machine sets (#1647)
mate4st Jun 5, 2023
f0b1db6
Update Golang to 1.20.5 (#1659)
pkprzekwas Jun 9, 2023
02c047f
Update CRDs for OSM (#1662)
ahmedwaleedmalik Jun 13, 2023
82156d3
[release/v1.57] Synchronize OWNERS_ALIASES file with Github teams (#1…
kubermatic-bot Jun 20, 2023
68c9630
Anexia Provider: allow configuration of multiple disks (#1669)
kubermatic-bot Jul 3, 2023
d6e24fa
Support for configuring multiple NICs for vSphere (#1677)
kubermatic-bot Jul 6, 2023
7eab515
VSphere: Fine tune multiple NIC support and add E2E tests (#1680)
kubermatic-bot Jul 7, 2023
3f9b8e0
VCD: Fix compute and sizing policies (#1688)
kubermatic-bot Jul 21, 2023
79510a9
Fix version of k8s.io/client-go in go.mod (#1694)
kubermatic-bot Jul 26, 2023
33d4292
Propagate datastore cluster for vSphere to cloud-config (#1695)
kubermatic-bot Jul 27, 2023
57952e3
Merge tag 'v1.57.3' into K8s-8779_merge-1.57.3
ovstuckrad Oct 19, 2023
cc4f657
Manually merged files
ovstuckrad Oct 19, 2023
54ddd93
Re-apply sys11 changes.
ovstuckrad Oct 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cicd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: 1.20.5
cache: true
-
name: Run the tests
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ examples/*.srl
.vscode
.gitpod.yml
cmd/machine-controller/__debug_bin
!pkg
8 changes: 4 additions & 4 deletions .prow/e2e-features.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -63,7 +63,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -91,7 +91,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand All @@ -118,7 +118,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
4 changes: 2 additions & 2 deletions .prow/postsubmits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ postsubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- /bin/bash
- -c
Expand Down Expand Up @@ -54,7 +54,7 @@ postsubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/upload-gocache.sh"
resources:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-alibaba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
9 changes: 5 additions & 4 deletions .prow/provider-anexia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@

presubmits:
- name: pull-machine-controller-e2e-anexia
# We've made the E2E tests for Anexia optional since it doesn't support k8s v1.26 at the moment.
# the tests on k8s v1.26+ will fail.
# TODO: These tests shouldn't be marked as optional.
optional: true
always_run: false
decorate: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
Expand All @@ -27,15 +31,12 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
- "TestAnexiaProvisioningE2E"
env:
# OperatingSystemManager does not yet support Anexia
- name: OPERATING_SYSTEM_MANAGER
value: "false"
- name: CLOUD_PROVIDER
value: anexia
securityContext:
Expand Down
55 changes: 12 additions & 43 deletions .prow/provider-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

presubmits:
- name: pull-machine-controller-e2e-aws
always_run: true
run_if_changed: "(pkg/cloudprovider/provider/aws/|pkg/userdata)"
decorate: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
labels:
Expand All @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand All @@ -45,7 +45,7 @@ presubmits:
limits:
memory: 7Gi

- name: pull-machine-controller-e2e-aws-legacy-userdata
- name: pull-machine-controller-e2e-aws-spot-instance-legacy-userdata
always_run: true
decorate: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
Expand All @@ -60,7 +60,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
env:
- name: OPERATING_SYSTEM_MANAGER
value: "false"
Expand All @@ -69,7 +69,7 @@ presubmits:
command:
- "./hack/ci/run-e2e-tests.sh"
args:
- "TestAWSProvisioningE2E"
- "TestAWSSpotInstanceProvisioningE2E"
securityContext:
privileged: true
resources:
Expand All @@ -93,7 +93,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -124,7 +124,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand All @@ -141,39 +141,8 @@ presubmits:
limits:
memory: 7Gi

- name: pull-machine-controller-e2e-aws-flatcar-containerd
run_if_changed: "(pkg/cloudprovider/provider/aws/|pkg/userdata)"
decorate: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
labels:
preset-aws: "true"
preset-hetzner: "true"
preset-e2e-ssh: "true"
preset-goproxy: "true"
preset-kind-volume-mounts: "true"
preset-docker-mirror: "true"
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
command:
- "./hack/ci/run-e2e-tests.sh"
args:
- "TestAWSFlatcarContainerdProvisioningE2E"
env:
- name: CLOUD_PROVIDER
value: aws
securityContext:
privileged: true
resources:
requests:
memory: 7Gi
cpu: 2
limits:
memory: 7Gi

- name: pull-machine-controller-e2e-aws-spot-instance
run_if_changed: "(pkg/cloudprovider/provider/aws/|pkg/userdata)"
always_run: true
decorate: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
labels:
Expand All @@ -187,7 +156,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -218,7 +187,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -249,7 +218,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -280,7 +249,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
8 changes: 4 additions & 4 deletions .prow/provider-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

presubmits:
- name: pull-machine-controller-e2e-azure
always_run: true
run_if_changed: "(pkg/cloudprovider/provider/azure/|pkg/userdata)"
decorate: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
labels:
Expand All @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -60,7 +60,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -93,7 +93,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-digitalocean.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-equinix-metal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-hetzner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-kubevirt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-linode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-nutanix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
8 changes: 2 additions & 6 deletions .prow/provider-openstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
presubmits:
- name: pull-machine-controller-e2e-openstack
run_if_changed: "(pkg/cloudprovider/provider/openstack/|pkg/userdata)"
# We've made the E2E tests for OpenStack optional since in-tree cloud provider for OpenStack was removed with k8s v1.26. Since MC depends on the in-tree cloud provider
# the tests on k8s v1.26+ will fail.
# TODO: These tests shouldn't be marked as optional.
optional: true
decorate: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
labels:
Expand All @@ -32,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -64,7 +60,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-scaleway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
4 changes: 2 additions & 2 deletions .prow/provider-vmware-cloud-director.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ presubmits:
always_run: false
decorate: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
run_if_changed: "(pkg/cloudprovider/provider/vmwareclouddirector/|pkg/userdata)"
run_if_changed: "(pkg/cloudprovider/provider/vmwareclouddirector/)"
labels:
preset-vcloud-director: "true"
preset-hetzner: "true"
Expand All @@ -29,7 +29,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-9
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-7
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
Loading
Loading