From 03f94a5279759d506a9d8397f6704d127e46aca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E6=B4=AA=E8=B4=9E?= Date: Wed, 19 Jul 2023 10:35:44 +0800 Subject: [PATCH] Revert "prepare for next release" This reverts commit 6b0cc730c9af992ff22598ef6194ff59eb2e1a35. --- VERSION | 2 +- dist/images/install.sh | 2 +- dist/images/ovn-ic-db-docker.sh | 2 +- kubeovn-helm/values.yaml | 2 +- pkg/controller/service_lb.go | 2 +- pkg/controller/vpc_dns.go | 2 +- yamls/speaker.yaml | 2 +- yamls/webhook.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index c2f4fbdd173..316ba050f54 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v1.11.10 +v1.11.9 diff --git a/dist/images/install.sh b/dist/images/install.sh index 7b0421a0b05..e1a88f1e100 100644 --- a/dist/images/install.sh +++ b/dist/images/install.sh @@ -39,7 +39,7 @@ CNI_CONF_DIR="/etc/cni/net.d" CNI_BIN_DIR="/opt/cni/bin" REGISTRY="kubeovn" -VERSION="v1.11.9" +VERSION="v1.11.8" IMAGE_PULL_POLICY="IfNotPresent" POD_CIDR="10.16.0.0/16" # Do NOT overlap with NODE/SVC/JOIN CIDR POD_GATEWAY="10.16.0.1" diff --git a/dist/images/ovn-ic-db-docker.sh b/dist/images/ovn-ic-db-docker.sh index 72396edd981..8cd0a90d195 100644 --- a/dist/images/ovn-ic-db-docker.sh +++ b/dist/images/ovn-ic-db-docker.sh @@ -1 +1 @@ -docker run -d --network=host -v /etc/ovn/:/etc/ovn -v /var/run/ovn:/var/run/ovn -v /var/log/ovn:/var/log/ovn kubeovn/kube-ovn:v1.11.9 bash start-ic-db.sh +docker run -d --network=host -v /etc/ovn/:/etc/ovn -v /var/run/ovn:/var/run/ovn -v /var/log/ovn:/var/log/ovn kubeovn/kube-ovn:v1.11.8 bash start-ic-db.sh diff --git a/kubeovn-helm/values.yaml b/kubeovn-helm/values.yaml index 67dda9c9dd6..23a508c8607 100644 --- a/kubeovn-helm/values.yaml +++ b/kubeovn-helm/values.yaml @@ -8,7 +8,7 @@ global: images: kubeovn: repository: kube-ovn - tag: v1.11.9 + tag: v1.11.8 support_arm: true thirdparty: true diff --git a/pkg/controller/service_lb.go b/pkg/controller/service_lb.go index 2ce2abde96a..616d27857fa 100644 --- a/pkg/controller/service_lb.go +++ b/pkg/controller/service_lb.go @@ -77,7 +77,7 @@ func (c *Controller) genLbSvcDeployment(svc *corev1.Service) (dp *v1.Deployment) "service": svc.Name, } - image := "kubeovn/vpc-nat-gateway:v1.11.9" + image := "kubeovn/vpc-nat-gateway:v1.11.8" if svc.Annotations[util.LbSvcPodImg] != "" { image = svc.Annotations[util.LbSvcPodImg] } diff --git a/pkg/controller/vpc_dns.go b/pkg/controller/vpc_dns.go index aba36f712b8..1467c27b231 100644 --- a/pkg/controller/vpc_dns.go +++ b/pkg/controller/vpc_dns.go @@ -48,7 +48,7 @@ const ( CorednsContainerName = "coredns" CorednsLabelKey = "k8s-app" CorednsTemplateDep = "coredns-template.yaml" - InitRouteImage = "kubeovn/vpc-nat-gateway:v1.11.9" + InitRouteImage = "kubeovn/vpc-nat-gateway:v1.11.8" ) func genVpcDnsDpName(name string) string { diff --git a/yamls/speaker.yaml b/yamls/speaker.yaml index 65d88b77827..ced6d9d1289 100644 --- a/yamls/speaker.yaml +++ b/yamls/speaker.yaml @@ -29,7 +29,7 @@ spec: hostNetwork: true containers: - name: kube-ovn-speaker - image: "kubeovn/kube-ovn:v1.11.9" + image: "kubeovn/kube-ovn:v1.11.8" imagePullPolicy: IfNotPresent command: - /kube-ovn/kube-ovn-speaker diff --git a/yamls/webhook.yaml b/yamls/webhook.yaml index cbbb8edce5a..8e747c0ff4f 100644 --- a/yamls/webhook.yaml +++ b/yamls/webhook.yaml @@ -33,7 +33,7 @@ spec: hostNetwork: true containers: - name: kube-ovn-webhook - image: "kubeovn/kube-ovn:v1.11.9" + image: "kubeovn/kube-ovn:v1.11.8" imagePullPolicy: IfNotPresent command: - /kube-ovn/kube-ovn-webhook