Skip to content

Commit 5976233

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #431 from shapeblue/stabilize-test-failures
Stabilize test failures
2 parents ad322bc + 8fdcaee commit 5976233

6 files changed

+48
-22
lines changed

‎config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackclusters.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,10 @@ spec:
426426
is built in.
427427
type: string
428428
offering:
429-
description: Cloudstack Network Offering the cluster
430-
is built in. Default is "DefaultIsolatedNetworkOfferingWithSourceNatService"
431-
for isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
429+
description: |-
430+
Cloudstack Network Offering the cluster is built in.
431+
Default is "DefaultIsolatedNetworkOfferingWithSourceNatService" for
432+
isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
432433
for VPC networks.
433434
type: string
434435
type:
@@ -448,7 +449,8 @@ spec:
448449
description: Cloudstack VPC Name of the network.
449450
type: string
450451
offering:
451-
description: Cloudstack VPC Offering for the network.
452+
description: |-
453+
Cloudstack VPC Offering for the network.
452454
Default is "Default VPC offering"
453455
type: string
454456
type: object

‎config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackfailuredomains.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,10 @@ spec:
194194
in.
195195
type: string
196196
offering:
197-
description: Cloudstack Network Offering the cluster is built
198-
in. Default is "DefaultIsolatedNetworkOfferingWithSourceNatService"
199-
for isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
197+
description: |-
198+
Cloudstack Network Offering the cluster is built in.
199+
Default is "DefaultIsolatedNetworkOfferingWithSourceNatService" for
200+
isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
200201
for VPC networks.
201202
type: string
202203
type:
@@ -216,7 +217,8 @@ spec:
216217
description: Cloudstack VPC Name of the network.
217218
type: string
218219
offering:
219-
description: Cloudstack VPC Offering for the network.
220+
description: |-
221+
Cloudstack VPC Offering for the network.
220222
Default is "Default VPC offering"
221223
type: string
222224
type: object

‎config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackisolatednetworks.yaml

+7-4
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,10 @@ spec:
219219
description: Netmask for the network.
220220
type: string
221221
offering:
222-
description: Offering for the network. Default is "DefaultIsolatedNetworkOfferingWithSourceNatService"
223-
for isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
222+
description: |-
223+
Offering for the network.
224+
Default is "DefaultIsolatedNetworkOfferingWithSourceNatService" for
225+
isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
224226
for VPC networks.
225227
type: string
226228
vpc:
@@ -236,8 +238,9 @@ spec:
236238
description: Cloudstack VPC Name of the network.
237239
type: string
238240
offering:
239-
description: Cloudstack VPC Offering for the network. Default
240-
is "Default VPC offering"
241+
description: |-
242+
Cloudstack VPC Offering for the network.
243+
Default is "Default VPC offering"
241244
type: string
242245
type: object
243246
required:

‎test/e2e/config/cloudstack.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ images:
1515
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
1616

1717
# Cluster API v1beta1 Preloads
18-
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.4.8
18+
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.9.6
1919
loadBehavior: tryLoad
20-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.4.8
20+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.9.6
2121
loadBehavior: tryLoad
22-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.4.8
22+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.9.6
2323
loadBehavior: tryLoad
24-
- name: gcr.io/k8s-staging-cluster-api/capd-manager-amd64:v1.4.8
24+
- name: gcr.io/k8s-staging-cluster-api/capd-manager-amd64:v1.9.6
2525
loadBehavior: tryLoad
2626
- name: quay.io/jetstack/cert-manager-cainjector:v1.13.1
2727
loadBehavior: tryLoad
@@ -34,8 +34,8 @@ providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.4.8
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/core-components.yaml"
37+
- name: v1.9.6
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.6/core-components.yaml"
3939
type: "url"
4040
contract: v1beta1
4141
replacements:
@@ -47,8 +47,8 @@ providers:
4747
- name: kubeadm
4848
type: BootstrapProvider
4949
versions:
50-
- name: v1.4.8
51-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/bootstrap-components.yaml"
50+
- name: v1.9.6
51+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.6/bootstrap-components.yaml"
5252
type: "url"
5353
contract: v1beta1
5454
replacements:
@@ -60,8 +60,8 @@ providers:
6060
- name: kubeadm
6161
type: ControlPlaneProvider
6262
versions:
63-
- name: v1.4.8
64-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/control-plane-components.yaml"
63+
- name: v1.9.6
64+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.6/control-plane-components.yaml"
6565
type: "url"
6666
contract: v1beta1
6767
replacements:

‎test/e2e/data/shared/v1beta1/metadata.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
22
kind: Metadata
33
releaseSeries:
4+
- major: 1
5+
minor: 9
6+
contract: v1beta1
7+
- major: 1
8+
minor: 8
9+
contract: v1beta1
10+
- major: 1
11+
minor: 7
12+
contract: v1beta1
13+
- major: 1
14+
minor: 6
15+
contract: v1beta1
16+
- major: 1
17+
minor: 5
18+
contract: v1beta1
419
- major: 1
520
minor: 4
621
contract: v1beta1

‎test/e2e/node_drain_timeout.go

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
. "github.com/onsi/ginkgo/v2"
2727
. "github.com/onsi/gomega"
28+
appsv1 "k8s.io/api/apps/v1"
2829
corev1 "k8s.io/api/core/v1"
2930
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3031
"k8s.io/utils/pointer"
@@ -97,9 +98,11 @@ func NodeDrainTimeoutSpec(ctx context.Context, inputGetter func() CommonSpecInpu
9798

9899
framework.DeployUnevictablePod(ctx, framework.DeployPodAndWaitInput{
99100
WorkloadClusterProxy: workloadClusterProxy,
101+
MachineDeployment: machineDeployments[0],
100102
DeploymentName: fmt.Sprintf("%s-%s", "unevictable-pod", util.RandomString(3)),
101103
Namespace: namespace.Name + "-unevictable-workload",
102104
WaitForDeploymentAvailableInterval: input.E2EConfig.GetIntervals(specName, "wait-deployment-available"),
105+
ModifyDeployment: func(deployment *appsv1.Deployment) {},
103106
})
104107

105108
By("Scale the machinedeployment down to zero. If we didn't have the NodeDrainTimeout duration, the node drain process would block this operator.")
@@ -122,6 +125,7 @@ func NodeDrainTimeoutSpec(ctx context.Context, inputGetter func() CommonSpecInpu
122125
DeploymentName: fmt.Sprintf("%s-%s", "unevictable-pod", util.RandomString(3)),
123126
Namespace: namespace.Name + "-unevictable-workload",
124127
WaitForDeploymentAvailableInterval: input.E2EConfig.GetIntervals(specName, "wait-deployment-available"),
128+
ModifyDeployment: func(deployment *appsv1.Deployment) {},
125129
})
126130

127131
By("Scale down the controlplane of the workload cluster and make sure that nodes running workload can be deleted even the draining process is blocked.")

0 commit comments

Comments
 (0)