| Message ID | 20220811132640.1154013-1-dceara@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] github: ovn-kubernetes: Update go, kube and libovsdb versions. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | success | github build: passed |
On Thu, Aug 11, 2022 at 11:27 PM Dumitru Ceara <dceara@redhat.com> wrote: > > With this they'll match the current upstream ovn-kubernetes code. > > Signed-off-by: Dumitru Ceara <dceara@redhat.com> Thanks. Applied to main. Do we need to backport this too ? Numan > --- > .ci/ovn-kubernetes/Dockerfile | 2 +- > .github/workflows/ovn-kubernetes.yml | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile > index 19662889e..e74b620be 100644 > --- a/.ci/ovn-kubernetes/Dockerfile > +++ b/.ci/ovn-kubernetes/Dockerfile > @@ -37,7 +37,7 @@ RUN rm rpm/rpmbuild/RPMS/x86_64/*debug* > RUN rm rpm/rpmbuild/RPMS/x86_64/*docker* > > # Build ovn-kubernetes > -FROM golang:1.17 as ovnkubebuilder > +FROM golang:1.18 as ovnkubebuilder > ARG OVNKUBE_COMMIT > ARG LIBOVSDB_COMMIT > > diff --git a/.github/workflows/ovn-kubernetes.yml b/.github/workflows/ovn-kubernetes.yml > index 32eb2350b..ba6b291ff 100644 > --- a/.github/workflows/ovn-kubernetes.yml > +++ b/.github/workflows/ovn-kubernetes.yml > @@ -13,10 +13,10 @@ concurrency: > cancel-in-progress: true > > env: > - GO_VERSION: "1.17.6" > - K8S_VERSION: v1.23.3 > + GO_VERSION: "1.18.4" > + K8S_VERSION: v1.24.0 > OVNKUBE_COMMIT: "master" > - LIBOVSDB_COMMIT: "8081fe24e48f" > + LIBOVSDB_COMMIT: "98c0bad3cff1" > KIND_CLUSTER_NAME: ovn > KIND_INSTALL_INGRESS: true > KIND_ALLOW_SYSTEM_WRITES: true > -- > 2.31.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On 8/15/22 05:38, Numan Siddique wrote: > On Thu, Aug 11, 2022 at 11:27 PM Dumitru Ceara <dceara@redhat.com> wrote: >> >> With this they'll match the current upstream ovn-kubernetes code. >> >> Signed-off-by: Dumitru Ceara <dceara@redhat.com> > > Thanks. Applied to main. Do we need to backport this too ? > It would be nice if we can push this to branch-22.06 too. I don't think it makes much sense to backport further. Upstream ovn-kubernetes uses the ovn-22.06 fedora builds in CI. Thanks, Dumitru
diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile index 19662889e..e74b620be 100644 --- a/.ci/ovn-kubernetes/Dockerfile +++ b/.ci/ovn-kubernetes/Dockerfile @@ -37,7 +37,7 @@ RUN rm rpm/rpmbuild/RPMS/x86_64/*debug* RUN rm rpm/rpmbuild/RPMS/x86_64/*docker* # Build ovn-kubernetes -FROM golang:1.17 as ovnkubebuilder +FROM golang:1.18 as ovnkubebuilder ARG OVNKUBE_COMMIT ARG LIBOVSDB_COMMIT diff --git a/.github/workflows/ovn-kubernetes.yml b/.github/workflows/ovn-kubernetes.yml index 32eb2350b..ba6b291ff 100644 --- a/.github/workflows/ovn-kubernetes.yml +++ b/.github/workflows/ovn-kubernetes.yml @@ -13,10 +13,10 @@ concurrency: cancel-in-progress: true env: - GO_VERSION: "1.17.6" - K8S_VERSION: v1.23.3 + GO_VERSION: "1.18.4" + K8S_VERSION: v1.24.0 OVNKUBE_COMMIT: "master" - LIBOVSDB_COMMIT: "8081fe24e48f" + LIBOVSDB_COMMIT: "98c0bad3cff1" KIND_CLUSTER_NAME: ovn KIND_INSTALL_INGRESS: true KIND_ALLOW_SYSTEM_WRITES: true
With this they'll match the current upstream ovn-kubernetes code. Signed-off-by: Dumitru Ceara <dceara@redhat.com> --- .ci/ovn-kubernetes/Dockerfile | 2 +- .github/workflows/ovn-kubernetes.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)