Skip to content

Commit 630b054

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #134 from nunnatsa/sync_upstream_1.10
Sync with upstream v1.10.0
2 parents ebbc1f6 + a804227 commit 630b054

21 files changed

+3022
-211
lines changed

‎.github/workflows/clusterkubevirtadm-test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
name: test-clusterkubevirtadm
1111
jobs:
1212
clusterkubevirtadm-unit_test:
13+
if: github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt'
1314
runs-on: ubuntu-latest
1415
steps:
1516
- name: Checkout code

‎.github/workflows/create_release.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ name: Upload Release Asset
77

88
jobs:
99
build-and-push-image:
10+
if: github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt'
1011
runs-on: ubuntu-latest
1112
steps:
1213
- name: Checkout code
@@ -24,6 +25,7 @@ jobs:
2425
make docker-build-all
2526
make docker-push-all
2627
build:
28+
if: github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt'
2729
name: Upload Release Asset
2830
needs: build-and-push-image
2931
runs-on: ubuntu-latest

‎.github/workflows/image_build.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
- "main"
55
jobs:
66
build-and-push-image:
7+
if: github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt'
78
runs-on: ubuntu-latest
89
steps:
910
- name: Checkout code

‎.github/workflows/test.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
$(go env GOPATH)/bin/goveralls -coverprofile=coverprofiles/cover.coverprofile -service=github
4444
4545
go-linter:
46+
if: github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt'
4647
runs-on: ubuntu-latest
4748
steps:
4849
- uses: actions/checkout@v3
@@ -57,6 +58,7 @@ jobs:
5758
version: v1.63.4
5859

5960
check-gen:
61+
if: github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt'
6062
runs-on: ubuntu-latest
6163
steps:
6264
- uses: actions/checkout@v3

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,27 +195,32 @@ spec:
195195
properties:
196196
lastTransitionTime:
197197
description: |-
198-
Last time the condition transitioned from one status to another.
198+
lastTransitionTime is the last time the condition transitioned from one status to another.
199199
This should be when the underlying condition changed. If that is not known, then using the time when
200200
the API field changed is acceptable.
201201
format: date-time
202202
type: string
203203
message:
204204
description: |-
205-
A human readable message indicating details about the transition.
205+
message is a human readable message indicating details about the transition.
206206
This field may be empty.
207+
maxLength: 10240
208+
minLength: 1
207209
type: string
208210
reason:
209211
description: |-
210-
The reason for the condition's last transition in CamelCase.
212+
reason is the reason for the condition's last transition in CamelCase.
211213
The specific API may choose whether or not this field is considered a guaranteed API.
212214
This field may be empty.
215+
maxLength: 256
216+
minLength: 1
213217
type: string
214218
severity:
215219
description: |-
216220
severity provides an explicit classification of Reason code, so the users or machines can immediately
217221
understand the current situation and act accordingly.
218222
The Severity field MUST be set only when Status=False.
223+
maxLength: 32
219224
type: string
220225
status:
221226
description: status of the condition, one of True, False, Unknown.
@@ -225,6 +230,8 @@ spec:
225230
type of condition in CamelCase or in foo.example.com/CamelCase.
226231
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
227232
can be useful (see .node.status.conditions), the ability to deconflict is important.
233+
maxLength: 256
234+
minLength: 1
228235
type: string
229236
required:
230237
- lastTransitionTime

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ spec:
8686
additionalProperties:
8787
type: string
8888
description: |-
89-
Map of string keys and values that can be used to organize and categorize
89+
labels is a map of string keys and values that can be used to organize and categorize
9090
(scope and select) objects. May match selectors of replication controllers
9191
and services.
9292
More info: http://kubernetes.io/docs/user-guide/labels

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

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2687,7 +2687,11 @@ spec:
26872687
state:
26882688
description: |-
26892689
State represents the requested operational state of the interface.
2690-
The (only) value supported is `absent`, expressing a request to remove the interface.
2690+
The supported values are:
2691+
`absent`, expressing a request to remove the interface.
2692+
`down`, expressing a request to set the link down.
2693+
`up`, expressing a request to set the link up.
2694+
Empty value functions as `up`.
26912695
type: string
26922696
tag:
26932697
description: If specified, the virtual
@@ -3119,6 +3123,17 @@ spec:
31193123
Defaults to a random generated uid.
31203124
type: string
31213125
type: object
3126+
ioThreads:
3127+
description: IOThreads specifies the IOThreads
3128+
options.
3129+
properties:
3130+
supplementalPoolThreadCount:
3131+
description: SupplementalPoolThreadCount specifies
3132+
how many iothreads are allocated for the
3133+
supplementalPool policy.
3134+
format: int32
3135+
type: integer
3136+
type: object
31223137
ioThreadsPolicy:
31233138
description: |-
31243139
Controls whether or not disks will share IOThreads.
@@ -4014,9 +4029,8 @@ spec:
40144029
the volume can be hotplugged and hotunplugged.
40154030
type: boolean
40164031
name:
4017-
description: |-
4018-
Name of both the DataVolume and the PVC in the same namespace.
4019-
After PVC population the DataVolume is garbage collected by default.
4032+
description: Name of both the DataVolume
4033+
and the PVC in the same namespace.
40204034
type: string
40214035
required:
40224036
- name
@@ -4334,11 +4348,19 @@ spec:
43344348
address.
43354349
properties:
43364350
address:
4337-
description: The machine address.
4351+
description: address is the machine address.
4352+
maxLength: 256
4353+
minLength: 1
43384354
type: string
43394355
type:
4340-
description: Machine address type, one of Hostname, ExternalIP,
4341-
InternalIP, ExternalDNS or InternalDNS.
4356+
description: type is the machine address type, one of Hostname,
4357+
ExternalIP, InternalIP, ExternalDNS or InternalDNS.
4358+
enum:
4359+
- Hostname
4360+
- ExternalIP
4361+
- InternalIP
4362+
- ExternalDNS
4363+
- InternalDNS
43424364
type: string
43434365
required:
43444366
- address
@@ -4353,27 +4375,32 @@ spec:
43534375
properties:
43544376
lastTransitionTime:
43554377
description: |-
4356-
Last time the condition transitioned from one status to another.
4378+
lastTransitionTime is the last time the condition transitioned from one status to another.
43574379
This should be when the underlying condition changed. If that is not known, then using the time when
43584380
the API field changed is acceptable.
43594381
format: date-time
43604382
type: string
43614383
message:
43624384
description: |-
4363-
A human readable message indicating details about the transition.
4385+
message is a human readable message indicating details about the transition.
43644386
This field may be empty.
4387+
maxLength: 10240
4388+
minLength: 1
43654389
type: string
43664390
reason:
43674391
description: |-
4368-
The reason for the condition's last transition in CamelCase.
4392+
reason is the reason for the condition's last transition in CamelCase.
43694393
The specific API may choose whether or not this field is considered a guaranteed API.
43704394
This field may be empty.
4395+
maxLength: 256
4396+
minLength: 1
43714397
type: string
43724398
severity:
43734399
description: |-
43744400
severity provides an explicit classification of Reason code, so the users or machines can immediately
43754401
understand the current situation and act accordingly.
43764402
The Severity field MUST be set only when Status=False.
4403+
maxLength: 32
43774404
type: string
43784405
status:
43794406
description: status of the condition, one of True, False, Unknown.
@@ -4383,6 +4410,8 @@ spec:
43834410
type of condition in CamelCase or in foo.example.com/CamelCase.
43844411
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
43854412
can be useful (see .node.status.conditions), the ability to deconflict is important.
4413+
maxLength: 256
4414+
minLength: 1
43864415
type: string
43874416
required:
43884417
- lastTransitionTime

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2791,7 +2791,11 @@ spec:
27912791
state:
27922792
description: |-
27932793
State represents the requested operational state of the interface.
2794-
The (only) value supported is `absent`, expressing a request to remove the interface.
2794+
The supported values are:
2795+
`absent`, expressing a request to remove the interface.
2796+
`down`, expressing a request to set the link down.
2797+
`up`, expressing a request to set the link up.
2798+
Empty value functions as `up`.
27952799
type: string
27962800
tag:
27972801
description: If specified, the
@@ -3235,6 +3239,18 @@ spec:
32353239
Defaults to a random generated uid.
32363240
type: string
32373241
type: object
3242+
ioThreads:
3243+
description: IOThreads specifies the IOThreads
3244+
options.
3245+
properties:
3246+
supplementalPoolThreadCount:
3247+
description: SupplementalPoolThreadCount
3248+
specifies how many iothreads are
3249+
allocated for the supplementalPool
3250+
policy.
3251+
format: int32
3252+
type: integer
3253+
type: object
32383254
ioThreadsPolicy:
32393255
description: |-
32403256
Controls whether or not disks will share IOThreads.
@@ -4154,9 +4170,8 @@ spec:
41544170
and hotunplugged.
41554171
type: boolean
41564172
name:
4157-
description: |-
4158-
Name of both the DataVolume and the PVC in the same namespace.
4159-
After PVC population the DataVolume is garbage collected by default.
4173+
description: Name of both the DataVolume
4174+
and the PVC in the same namespace.
41604175
type: string
41614176
required:
41624177
- name

‎e2e/create-cluster_test.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,9 @@ var _ = Describe("CreateCluster", func() {
331331
installCalicoCNI := func() {
332332
cmd := exec.Command(KubectlPath, "--kubeconfig", tenantKubeconfigFile, "--insecure-skip-tls-verify", "--validate=false", "--server", fmt.Sprintf("https://localhost:%d", tenantAccessor.tenantApiPort), "apply", "-f", calicoManifestsUrl)
333333
_, stderr := RunCmd(cmd)
334-
Expect(stderr).To(BeEmpty(), "failed to apply calico CNI: %s", string(stderr))
334+
if len(stderr) > 0 {
335+
GinkgoLogr.Info("Warning", "clusterctl's stderr", string(stderr))
336+
}
335337
}
336338

337339
waitForNodeUpdate := func(ctx context.Context) {
@@ -503,7 +505,9 @@ var _ = Describe("CreateCluster", func() {
503505
"--worker-machine-count=1",
504506
"--from", "templates/cluster-template.yaml")
505507
stdout, stderr := RunCmd(cmd)
506-
Expect(stderr).To(BeEmpty(), "command error output: %s", string(stdout))
508+
if len(stderr) > 0 {
509+
GinkgoLogr.Info("Warning", "clusterctl's stderr", string(stderr))
510+
}
507511

508512
Expect(os.WriteFile(manifestsFile, stdout, 0644)).To(Succeed())
509513

@@ -839,7 +843,9 @@ var _ = Describe("CreateCluster", func() {
839843
"--worker-machine-count=1",
840844
"--target-namespace", namespace)
841845
stdout, stderr := RunCmd(cmd)
842-
Expect(stderr).To(BeEmpty(), "command error output: %s", string(stderr))
846+
if len(stderr) > 0 {
847+
GinkgoLogr.Info("Warning", "clusterctl's stderr", string(stderr))
848+
}
843849

844850
Expect(os.WriteFile(manifestsFile, stdout, 0644)).To(Succeed())
845851

0 commit comments

Comments
 (0)