Skip to content

improve vm-operator versioning in CAPV #36754

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.

Sign up for GitHub

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

Open
fabriziopandini wants to merge 1 commit into
base: master
Choose a base branch
from
Open

improve vm-operator versioning in CAPV #36754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions ...rnetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-main-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ periodics:
testgrid-num-failures-to-alert: "4"
description: Runs all e2e tests

- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-v1-8-6-v1alpha2-main
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-8-0-v1alpha2-main
cluster: k8s-infra-prow-build
labels:
preset-dind-enabled: "true"
Expand Down Expand Up @@ -329,7 +329,7 @@ periodics:
- name: GINKGO_FOCUS
value: "\\[supervisor\\] \\[PR-Blocking\\]"
- name: VM_OPERATOR_VERSION
value: "v1.8.6-0-gde75746a"
value: "8.0"
- name: VM_OPERATOR_API_VERSION
value: "v1alpha2"
# we need privileged mode in order to do docker in docker
Expand All @@ -346,12 +346,12 @@ periodics:
memory: "6Gi"
annotations:
testgrid-dashboards: cluster-api-provider-vsphere-main
testgrid-tab-name: periodic-e2e-supervisor-v1-8-6-v1alpha2-main
testgrid-tab-name: periodic-e2e-supervisor-8-0-v1alpha2-main
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-vsphere-alerts@kubernetes.io
testgrid-num-failures-to-alert: "4"
description: Runs all e2e tests

- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-v1-9-0-v1alpha2-main
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-9-1-v1alpha2-main
cluster: k8s-infra-prow-build
labels:
preset-dind-enabled: "true"
Expand Down Expand Up @@ -386,7 +386,7 @@ periodics:
- name: GINKGO_FOCUS
value: "\\[supervisor\\] \\[PR-Blocking\\]"
- name: VM_OPERATOR_VERSION
value: "v1.9.0-567-g93918c59"
value: "9.1"
- name: VM_OPERATOR_API_VERSION
value: "v1alpha2"
# we need privileged mode in order to do docker in docker
Expand All @@ -403,7 +403,7 @@ periodics:
memory: "6Gi"
annotations:
testgrid-dashboards: cluster-api-provider-vsphere-main
testgrid-tab-name: periodic-e2e-supervisor-v1-9-0-v1alpha2-main
testgrid-tab-name: periodic-e2e-supervisor-9-1-v1alpha2-main
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-vsphere-alerts@kubernetes.io
testgrid-num-failures-to-alert: "4"
description: Runs all e2e tests
Expand Down
18 changes: 18 additions & 0 deletions ...ubernetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-prowjob-gen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ prow_ignored:
to: "1.36"
- from: "1.36"
to: "1.37"
other:
vmOperator:
- version: "8.0"
apiVersion: "v1alpha2"
- version: "9.1"
apiVersion: "v1alpha2"
# This version is tested by default
# - version: "9.1"
# apiVersion: "v1alpha5"
release-1.16:
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20260316-e86cefa561-1.35"
# interval for coverage job
Expand All @@ -36,6 +45,15 @@ prow_ignored:
to: "1.35"
- from: "1.35"
to: "1.36"
other:
vmOperator:
- version: "8.0"
apiVersion: "v1alpha2"
- version: "9.1"
apiVersion: "v1alpha2"
# This version is tested by default
# - version: "9.1"
# apiVersion: "v1alpha5"
release-1.15:
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20260316-e86cefa561-1.34"
# interval for coverage job
Expand Down
12 changes: 6 additions & 6 deletions ...igs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-16-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ periodics:
testgrid-num-failures-to-alert: "4"
description: Runs all e2e tests

- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-v1-8-6-v1alpha2-release-1-16
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-8-0-v1alpha2-release-1-16
cluster: k8s-infra-prow-build
labels:
preset-dind-enabled: "true"
Expand Down Expand Up @@ -329,7 +329,7 @@ periodics:
- name: GINKGO_FOCUS
value: "\\[supervisor\\] \\[PR-Blocking\\]"
- name: VM_OPERATOR_VERSION
value: "v1.8.6-0-gde75746a"
value: "8.0"
- name: VM_OPERATOR_API_VERSION
value: "v1alpha2"
# we need privileged mode in order to do docker in docker
Expand All @@ -346,12 +346,12 @@ periodics:
memory: "6Gi"
annotations:
testgrid-dashboards: cluster-api-provider-vsphere-1.16
testgrid-tab-name: periodic-e2e-supervisor-v1-8-6-v1alpha2-release-1-16
testgrid-tab-name: periodic-e2e-supervisor-8-0-v1alpha2-release-1-16
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-vsphere-alerts@kubernetes.io
testgrid-num-failures-to-alert: "4"
description: Runs all e2e tests

- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-v1-9-0-v1alpha2-release-1-16
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-9-1-v1alpha2-release-1-16
cluster: k8s-infra-prow-build
labels:
preset-dind-enabled: "true"
Expand Down Expand Up @@ -386,7 +386,7 @@ periodics:
- name: GINKGO_FOCUS
value: "\\[supervisor\\] \\[PR-Blocking\\]"
- name: VM_OPERATOR_VERSION
value: "v1.9.0-567-g93918c59"
value: "9.1"
- name: VM_OPERATOR_API_VERSION
value: "v1alpha2"
# we need privileged mode in order to do docker in docker
Expand All @@ -403,7 +403,7 @@ periodics:
memory: "6Gi"
annotations:
testgrid-dashboards: cluster-api-provider-vsphere-1.16
testgrid-tab-name: periodic-e2e-supervisor-v1-9-0-v1alpha2-release-1-16
testgrid-tab-name: periodic-e2e-supervisor-9-1-v1alpha2-release-1-16
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-vsphere-alerts@kubernetes.io
testgrid-num-failures-to-alert: "4"
description: Runs all e2e tests
Expand Down
8 changes: 3 additions & 5 deletions ...gs/cluster-api-provider-vsphere/templates/cluster-api-provider-vsphere-periodics.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,9 @@ periodics:
description: Runs all e2e tests
{{ if eq $mode "supervisor" -}}
{{ if not (or (eq $.branch "release-1.13") (eq $.branch "release-1.14") (eq $.branch "release-1.15")) -}}
{{ $vmOperatorVersions := list "v1.8.6-0-gde75746a" "v1.9.0-567-g93918c59" -}}
{{ range $i, $vmOperatorVersion := $vmOperatorVersions -}}
{{ $vmOperatorApiVersions := list "v1alpha2" -}}
{{ range $j, $vmOperatorApiVersion := $vmOperatorApiVersions }}
{{ range $i, $matrix := $.config.Other.vmOperator -}}
{{ $vmOperatorVersion := $matrix.version -}}
{{ $vmOperatorApiVersion := $matrix.apiVersion }}
- name: periodic-cluster-api-provider-vsphere-e2e-{{ $mode }}-{{ printf "%.6s" (ReplaceAll $vmOperatorVersion "." "-") }}-{{ $vmOperatorApiVersion }}-{{ ReplaceAll $.branch "." "-" }}
cluster: k8s-infra-prow-build
labels:
Expand Down Expand Up @@ -164,7 +163,6 @@ periodics:
{{ end }}
{{- end }}
{{- end }}
{{- end }}
- name: periodic-cluster-api-provider-vsphere-e2e-vcsim-{{ $mode }}-{{ ReplaceAll $.branch "." "-" }}
cluster: eks-prow-build-cluster
labels:
Expand Down