From b5ddc8a0d2573f3c045f33cd7d8e7f810090cc12 Mon Sep 17 00:00:00 2001 From: oscollabus Date: Thu, 8 Dec 2022 14:43:22 +0200 Subject: [PATCH] ksd: Bump manually to v0.0.7 (#1475) * ksd: Deploy kubevirt Needed for the e2e tests Signed-off-by: Or Shoval * ksd: Bump manually to v0.0.7 Bump KubeSecondaryDNS manually, since auto-bumper has problems. See https://github.com/kubevirt/cluster-network-addons-operator/pull/1474 Signed-off-by: Or Shoval * ksd: Fix bump script Since the fields might have empty string, need to use set instead of update. Signed-off-by: Or Shoval * ksd: Run bump script (v0.0.7) Signed-off-by: Or Shoval Signed-off-by: Or Shoval --- automation/check-patch.e2e-kube-secondary-dns-functests.sh | 1 + components.yaml | 4 ++-- hack/components/bump-kube-secondary-dns.sh | 4 ++-- pkg/components/components.go | 2 +- test/releases/99.0.0.go | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/automation/check-patch.e2e-kube-secondary-dns-functests.sh b/automation/check-patch.e2e-kube-secondary-dns-functests.sh index ecf79d841..20aaab808 100755 --- a/automation/check-patch.e2e-kube-secondary-dns-functests.sh +++ b/automation/check-patch.e2e-kube-secondary-dns-functests.sh @@ -29,6 +29,7 @@ main() { trap teardown EXIT + ./hack/deploy-kubevirt.sh cd ${TMP_COMPONENT_PATH} make create-nodeport echo "Run kube-secondary-dns functional tests" diff --git a/components.yaml b/components.yaml index 0877c7d1d..2d6a591af 100644 --- a/components.yaml +++ b/components.yaml @@ -43,7 +43,7 @@ components: metadata: v0.29.1 kube-secondary-dns: url: https://github.com/kubevirt/kubesecondarydns - commit: a7779d99e0b196119f8bf9337186f091aea54df0 + commit: 98b0eda5c294091ed7b5132419009c0751357838 branch: main update-policy: tagged - metadata: v0.0.5 + metadata: v0.0.7 diff --git a/hack/components/bump-kube-secondary-dns.sh b/hack/components/bump-kube-secondary-dns.sh index eadc2a1dd..61f27e1a2 100755 --- a/hack/components/bump-kube-secondary-dns.sh +++ b/hack/components/bump-kube-secondary-dns.sh @@ -15,8 +15,8 @@ function __parametize_by_object() { ;; ./ConfigMap_secondary-dns.yaml) yaml-utils::update_param ${f} metadata.namespace '{{ .Namespace }}' - yaml-utils::update_param ${f} data.DOMAIN '{{ .Domain }}' - yaml-utils::update_param ${f} data.NAME_SERVER_IP '{{ .NameServerIp }}' + yaml-utils::set_param ${f} data.DOMAIN '{{ .Domain }}' + yaml-utils::set_param ${f} data.NAME_SERVER_IP '{{ .NameServerIp }}' yaml-utils::remove_single_quotes_from_yaml ${f} ;; ./ClusterRoleBinding_secondary.yaml) diff --git a/pkg/components/components.go b/pkg/components/components.go index 986ae4505..af04180bb 100644 --- a/pkg/components/components.go +++ b/pkg/components/components.go @@ -37,7 +37,7 @@ const ( OvsCniImageDefault = "quay.io/kubevirt/ovs-cni-plugin@sha256:3654b80dd5e459c3e73dd027d732620ed8b488b8a15dfe7922457d16c7e834c3" MacvtapCniImageDefault = "quay.io/kubevirt/macvtap-cni@sha256:5a288f1f9956c2ea8127fa736b598326852d2aa58a8469fa663a1150c2313b02" KubeRbacProxyImageDefault = "quay.io/openshift/origin-kube-rbac-proxy@sha256:baedb268ac66456018fb30af395bb3d69af5fff3252ff5d549f0231b1ebb6901" - KubeSecondaryDNSImageDefault = "ghcr.io/kubevirt/kubesecondarydns@sha256:b25074818c76d149cbf64bfb4b5559afcc1c3d4733b450ce70856903a80eb2c7" + KubeSecondaryDNSImageDefault = "ghcr.io/kubevirt/kubesecondarydns@sha256:9bb0e7784cab32a8683f56b3d370b4ab5efed339fa372a8f3ca2e0408e1f8f19" CoreDNSImageDefault = "k8s.gcr.io/coredns/coredns@sha256:5b6ec0d6de9baaf3e92d0f66cd96a25b9edbce8716f5f15dcd1a616b3abd590e" ) diff --git a/test/releases/99.0.0.go b/test/releases/99.0.0.go index 65e33ac4b..46bc8e7d8 100644 --- a/test/releases/99.0.0.go +++ b/test/releases/99.0.0.go @@ -75,7 +75,7 @@ func init() { ParentName: secondaryDNSDeployment, ParentKind: "Deployment", Name: "status-monitor", - Image: "ghcr.io/kubevirt/kubesecondarydns@sha256:b25074818c76d149cbf64bfb4b5559afcc1c3d4733b450ce70856903a80eb2c7", + Image: "ghcr.io/kubevirt/kubesecondarydns@sha256:9bb0e7784cab32a8683f56b3d370b4ab5efed339fa372a8f3ca2e0408e1f8f19", }, { ParentName: secondaryDNSDeployment,