Skip to content

Commit

Permalink
2e/lifecycle: Update versions for release PR
Browse files Browse the repository at this point in the history 
The CI will now support the versions on supported stable branches

Signed-off-by: Ram Lavi <ralavi@redhat.com>
  • Loading branch information
@RamLavi
RamLavi committed Nov 1, 2023
1 parent a89a180 commit 074e383
Show file tree
Hide file tree
Showing 5 changed files with 393 additions and 1 deletion.
2 changes: 1 addition & 1 deletion automation/check-patch.e2e-lifecycle-k8s.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ main() {
export E2E_TEST_TIMEOUT=4h
else
# Don't run all upgrade tests in regular PRs, stick to those released under HCO
export RELEASES_SELECTOR="{0.65.10,0.76.3,0.79.1,0.85.0,99.0.0}"
export RELEASES_SELECTOR="{0.76.3,0.79.2,0.85.3,0.89.0,99.0.0}"
fi

make cluster-down
Expand Down
83 changes: 83 additions & 0 deletions test/releases/0.79.2.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
package releases

import (
cnao "github.com/kubevirt/cluster-network-addons-operator/pkg/apis/networkaddonsoperator/shared"
"github.com/kubevirt/cluster-network-addons-operator/pkg/components"
)

func init() {
release := Release{
Version: "0.79.2",
Containers: []cnao.Container{
{
ParentName: "multus",
ParentKind: "DaemonSet",
Name: "kube-multus",
Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:829c27e9392d013eee5086ca7670d7326d723ebaec526237215e86086b5a3234",
},
{
ParentName: "multus",
ParentKind: "DaemonSet",
Name: "install-multus-binary",
Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:829c27e9392d013eee5086ca7670d7326d723ebaec526237215e86086b5a3234",
},
{
ParentName: "bridge-marker",
ParentKind: "DaemonSet",
Name: "bridge-marker",
Image: "quay.io/kubevirt/bridge-marker@sha256:5d24c6d1ecb0556896b7b81c7e5260b54173858425777b7a84df8a706c07e6d2",
},
{
ParentName: "kube-cni-linux-bridge-plugin",
ParentKind: "DaemonSet",
Name: "cni-plugins",
Image: "quay.io/kubevirt/cni-default-plugins@sha256:406b43253fb5d45f50d1543879353822e3f746e2794b65ab30754e800386b76d",
},
{
ParentName: "kubemacpool-mac-controller-manager",
ParentKind: "Deployment",
Name: "manager",
Image: "quay.io/kubevirt/kubemacpool@sha256:9dee66dba5655e2dc70561d4d882d7ee204735ad82f81b24d0b338c428cb918b",
},
{
ParentName: "kubemacpool-mac-controller-manager",
ParentKind: "Deployment",
Name: "kube-rbac-proxy",
Image: components.KubeRbacProxyImageDefault,
},
{
ParentName: "kubemacpool-cert-manager",
ParentKind: "Deployment",
Name: "manager",
Image: "quay.io/kubevirt/kubemacpool@sha256:9dee66dba5655e2dc70561d4d882d7ee204735ad82f81b24d0b338c428cb918b",
},
{
ParentName: "ovs-cni-amd64",
ParentKind: "DaemonSet",
Name: "ovs-cni-plugin",
Image: "quay.io/kubevirt/ovs-cni-plugin@sha256:74a98ef62ca88eba48f35b733711d5e37f81bec06934d94b6a039a5cd92d5499",
},
{
ParentName: "ovs-cni-amd64",
ParentKind: "DaemonSet",
Name: "ovs-cni-marker",
Image: "quay.io/kubevirt/ovs-cni-plugin@sha256:74a98ef62ca88eba48f35b733711d5e37f81bec06934d94b6a039a5cd92d5499",
},
},
SupportedSpec: cnao.NetworkAddonsConfigSpec{
KubeMacPool: &cnao.KubeMacPool{},
LinuxBridge: &cnao.LinuxBridge{},
Multus: &cnao.Multus{},
Ovs: &cnao.Ovs{},
},
Manifests: []string{
"network-addons-config.crd.yaml",
"operator.yaml",
},
CrdCleanUp: []string{
"network-attachment-definitions.k8s.cni.cncf.io",
"networkaddonsconfigs.networkaddonsoperator.network.kubevirt.io",
},
}
releases = append(releases, release)
}
103 changes: 103 additions & 0 deletions test/releases/0.85.1.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
package releases

import (
cnao "github.com/kubevirt/cluster-network-addons-operator/pkg/apis/networkaddonsoperator/shared"
"github.com/kubevirt/cluster-network-addons-operator/pkg/components"
)

func init() {
release := Release{
Version: "0.85.1",
Containers: []cnao.Container{
{
ParentName: "multus",
ParentKind: "DaemonSet",
Name: "kube-multus",
Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:4e336bd177b5c60e753be48484abb48edb002c7207de9f265fff2e00e8f5106e",
},
{
ParentName: "dynamic-networks-controller-ds",
ParentKind: "DaemonSet",
Name: "dynamic-networks-controller",
Image: "ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller@sha256:ef8fe97a52eb9b3c03e99979a42cf2edaa7b3365cb3eb4dd1654b1bb9e73d7a3",
},
{
ParentName: "multus",
ParentKind: "DaemonSet",
Name: "install-multus-binary",
Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:4e336bd177b5c60e753be48484abb48edb002c7207de9f265fff2e00e8f5106e",
},
{
ParentName: "bridge-marker",
ParentKind: "DaemonSet",
Name: "bridge-marker",
Image: "quay.io/kubevirt/bridge-marker@sha256:5d24c6d1ecb0556896b7b81c7e5260b54173858425777b7a84df8a706c07e6d2",
},
{
ParentName: "kube-cni-linux-bridge-plugin",
ParentKind: "DaemonSet",
Name: "cni-plugins",
Image: "quay.io/kubevirt/cni-default-plugins@sha256:2871dd1b09cec8cb669a2008611cb81c6f9098eb674c757725154ae002ea7ab6",
},
{
ParentName: "kubemacpool-mac-controller-manager",
ParentKind: "Deployment",
Name: "manager",
Image: "quay.io/kubevirt/kubemacpool@sha256:0cc5ad824fc163d6dea5e9bd872467c691eaa9a88944008b5d746495b2a72214",
},
{
ParentName: "kubemacpool-mac-controller-manager",
ParentKind: "Deployment",
Name: "kube-rbac-proxy",
Image: components.KubeRbacProxyImageDefault,
},
{
ParentName: "kubemacpool-cert-manager",
ParentKind: "Deployment",
Name: "manager",
Image: "quay.io/kubevirt/kubemacpool@sha256:0cc5ad824fc163d6dea5e9bd872467c691eaa9a88944008b5d746495b2a72214",
},
{
ParentName: "ovs-cni-amd64",
ParentKind: "DaemonSet",
Name: "ovs-cni-plugin",
Image: "quay.io/kubevirt/ovs-cni-plugin@sha256:5f7290e2294255ab2547c3b4bf48cc2d75531ec5a43e600366e9b2719bef983f",
},
{
ParentName: "ovs-cni-amd64",
ParentKind: "DaemonSet",
Name: "ovs-cni-marker",
Image: "quay.io/kubevirt/ovs-cni-plugin@sha256:5f7290e2294255ab2547c3b4bf48cc2d75531ec5a43e600366e9b2719bef983f",
},
{
ParentName: "secondary-dns",
ParentKind: "Deployment",
Name: "status-monitor",
Image: "ghcr.io/kubevirt/kubesecondarydns@sha256:b489a7c5d05b000f776c9c302985b8b7f29ff31f577a1480912ed625c8772d6b",
},
{
ParentName: "secondary-dns",
ParentKind: "Deployment",
Name: "secondary-dns",
Image: components.CoreDNSImageDefault,
},
},
SupportedSpec: cnao.NetworkAddonsConfigSpec{
KubeMacPool: &cnao.KubeMacPool{},
LinuxBridge: &cnao.LinuxBridge{},
Multus: &cnao.Multus{},
Ovs: &cnao.Ovs{},
MultusDynamicNetworks: &cnao.MultusDynamicNetworks{},
KubeSecondaryDNS: &cnao.KubeSecondaryDNS{},
},
Manifests: []string{
"network-addons-config.crd.yaml",
"operator.yaml",
},
CrdCleanUp: []string{
"network-attachment-definitions.k8s.cni.cncf.io",
"networkaddonsconfigs.networkaddonsoperator.network.kubevirt.io",
},
}
releases = append(releases, release)
}
103 changes: 103 additions & 0 deletions test/releases/0.85.2.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
package releases

import (
cnao "github.com/kubevirt/cluster-network-addons-operator/pkg/apis/networkaddonsoperator/shared"
"github.com/kubevirt/cluster-network-addons-operator/pkg/components"
)

func init() {
release := Release{
Version: "0.85.2",
Containers: []cnao.Container{
{
ParentName: "multus",
ParentKind: "DaemonSet",
Name: "kube-multus",
Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:4e336bd177b5c60e753be48484abb48edb002c7207de9f265fff2e00e8f5106e",
},
{
ParentName: "dynamic-networks-controller-ds",
ParentKind: "DaemonSet",
Name: "dynamic-networks-controller",
Image: "ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller@sha256:ef8fe97a52eb9b3c03e99979a42cf2edaa7b3365cb3eb4dd1654b1bb9e73d7a3",
},
{
ParentName: "multus",
ParentKind: "DaemonSet",
Name: "install-multus-binary",
Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:4e336bd177b5c60e753be48484abb48edb002c7207de9f265fff2e00e8f5106e",
},
{
ParentName: "bridge-marker",
ParentKind: "DaemonSet",
Name: "bridge-marker",
Image: "quay.io/kubevirt/bridge-marker@sha256:5d24c6d1ecb0556896b7b81c7e5260b54173858425777b7a84df8a706c07e6d2",
},
{
ParentName: "kube-cni-linux-bridge-plugin",
ParentKind: "DaemonSet",
Name: "cni-plugins",
Image: "quay.io/kubevirt/cni-default-plugins@sha256:406b43253fb5d45f50d1543879353822e3f746e2794b65ab30754e800386b76d",
},
{
ParentName: "kubemacpool-mac-controller-manager",
ParentKind: "Deployment",
Name: "manager",
Image: "quay.io/kubevirt/kubemacpool@sha256:0cc5ad824fc163d6dea5e9bd872467c691eaa9a88944008b5d746495b2a72214",
},
{
ParentName: "kubemacpool-mac-controller-manager",
ParentKind: "Deployment",
Name: "kube-rbac-proxy",
Image: components.KubeRbacProxyImageDefault,
},
{
ParentName: "kubemacpool-cert-manager",
ParentKind: "Deployment",
Name: "manager",
Image: "quay.io/kubevirt/kubemacpool@sha256:0cc5ad824fc163d6dea5e9bd872467c691eaa9a88944008b5d746495b2a72214",
},
{
ParentName: "ovs-cni-amd64",
ParentKind: "DaemonSet",
Name: "ovs-cni-plugin",
Image: "quay.io/kubevirt/ovs-cni-plugin@sha256:5f7290e2294255ab2547c3b4bf48cc2d75531ec5a43e600366e9b2719bef983f",
},
{
ParentName: "ovs-cni-amd64",
ParentKind: "DaemonSet",
Name: "ovs-cni-marker",
Image: "quay.io/kubevirt/ovs-cni-plugin@sha256:5f7290e2294255ab2547c3b4bf48cc2d75531ec5a43e600366e9b2719bef983f",
},
{
ParentName: "secondary-dns",
ParentKind: "Deployment",
Name: "status-monitor",
Image: "ghcr.io/kubevirt/kubesecondarydns@sha256:b489a7c5d05b000f776c9c302985b8b7f29ff31f577a1480912ed625c8772d6b",
},
{
ParentName: "secondary-dns",
ParentKind: "Deployment",
Name: "secondary-dns",
Image: components.CoreDNSImageDefault,
},
},
SupportedSpec: cnao.NetworkAddonsConfigSpec{
KubeMacPool: &cnao.KubeMacPool{},
LinuxBridge: &cnao.LinuxBridge{},
Multus: &cnao.Multus{},
Ovs: &cnao.Ovs{},
MultusDynamicNetworks: &cnao.MultusDynamicNetworks{},
KubeSecondaryDNS: &cnao.KubeSecondaryDNS{},
},
Manifests: []string{
"network-addons-config.crd.yaml",
"operator.yaml",
},
CrdCleanUp: []string{
"network-attachment-definitions.k8s.cni.cncf.io",
"networkaddonsconfigs.networkaddonsoperator.network.kubevirt.io",
},
}
releases = append(releases, release)
}

0 comments on commit 074e383

Please sign in to comment.