From 71716b4a5d3a3a651cfe16e10769a004f0876a5c Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Mon, 24 May 2021 16:09:39 -0700 Subject: [PATCH 1/2] Update libcalico-go pin --- go.mod | 8 ++++---- go.sum | 14 ++++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index f2a14e310..d795aeab4 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/onsi/gomega v1.10.1 github.com/pkg/errors v0.9.1 github.com/projectcalico/cni-plugin v1.11.1-0.20210429212403-42a9e6bae0c6 - github.com/projectcalico/felix v0.0.0-20210423211421-b87d0f53161d - github.com/projectcalico/libcalico-go v1.7.2-0.20210423182314-3aa7a9eeb8ea - github.com/projectcalico/typha v0.7.3-0.20210423192651-88aa888efc7e + github.com/projectcalico/felix v0.0.0-20210514000450-071dfeb9531e + github.com/projectcalico/libcalico-go v1.7.2-0.20210510231246-b2f91f5ac4d6 + github.com/projectcalico/typha v0.7.3-0.20210513225950-7436545ca0e6 github.com/sirupsen/logrus v1.4.2 github.com/vishvananda/netlink v1.1.0 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 @@ -22,7 +22,7 @@ require ( replace ( github.com/Microsoft/hcsshim => github.com/projectcalico/hcsshim v0.8.9-calico - github.com/kelseyhightower/confd => github.com/projectcalico/confd v1.0.1-0.20210423201527-6821626ef3d1 + github.com/kelseyhightower/confd => github.com/projectcalico/confd v1.0.1-0.20210513230927-1a6921e026b0 github.com/sirupsen/logrus => github.com/projectcalico/logrus v1.0.4-calico diff --git a/go.sum b/go.sum index 800919da8..7c55b0a3d 100644 --- a/go.sum +++ b/go.sum @@ -571,10 +571,10 @@ github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prY github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= github.com/projectcalico/cni-plugin v1.11.1-0.20210429212403-42a9e6bae0c6 h1:lOBPU5iPjVt8GKD14V1M8ZpjQI27WQuoBAJhS2XBJpg= github.com/projectcalico/cni-plugin v1.11.1-0.20210429212403-42a9e6bae0c6/go.mod h1:BhEAm/L/RGvxdx6JGOh4tWTrxTOS1SlG2/QRQwGOqW8= -github.com/projectcalico/confd v1.0.1-0.20210423201527-6821626ef3d1 h1:KGQo5U7RsxuroEuTxZl/JRLvVMZGOy1HSUoOo4OSOYQ= -github.com/projectcalico/confd v1.0.1-0.20210423201527-6821626ef3d1/go.mod h1:03oWrc3VpkaPZ02FCfceHIIivc68ta3NbLxrU0888EU= -github.com/projectcalico/felix v0.0.0-20210423211421-b87d0f53161d h1:OgMdZh5ddXkNev6HKMuuQjhZo3NLBi28HhuKNi9PiCE= -github.com/projectcalico/felix v0.0.0-20210423211421-b87d0f53161d/go.mod h1:K0Ut3FZBrbmvUj9NssMkIF9r5GEYp70yp4r4tYjQBQ8= +github.com/projectcalico/confd v1.0.1-0.20210513230927-1a6921e026b0 h1:0xzMqTpJVYuyv8JWkZJ6PEwjnLPTbk9h332cnNDPxYk= +github.com/projectcalico/confd v1.0.1-0.20210513230927-1a6921e026b0/go.mod h1:sV3gMuCrL6Y1igcm5ggnDmQJFV5v9aPpgi9/vMITCWo= +github.com/projectcalico/felix v0.0.0-20210514000450-071dfeb9531e h1:Pgn34O4O8TKOOu7+gZIF4K2kESuxM9XHiLWWvQXH9G4= +github.com/projectcalico/felix v0.0.0-20210514000450-071dfeb9531e/go.mod h1:1052CmM6DX2Qy8gyWJTwamKSi9+AslcJbSm7tcQXAfU= github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba h1:aaF2byUCZhzszHsfPEr2M3qcU4ibtD/yk/il2R7T1PU= github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba/go.mod h1:q8EdCgBdMQzgiX/uk4GXLWLk+gIHd1a7mWUAamJKDb4= github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 h1:Jt2Pic9dxgJisekm8q2WV9FaWxUJhhRfwHSP640drww= @@ -583,12 +583,14 @@ github.com/projectcalico/hcsshim v0.8.9-calico h1:aRrOWouDTzKwaIoRGMV/I1QikR+ikw github.com/projectcalico/hcsshim v0.8.9-calico/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= github.com/projectcalico/libcalico-go v1.7.2-0.20210423182314-3aa7a9eeb8ea h1:r+d8Jg/07nSqJf06Cs8oFT1FZDQR4bGaPiyPl7pWq/8= github.com/projectcalico/libcalico-go v1.7.2-0.20210423182314-3aa7a9eeb8ea/go.mod h1:epPDUZnPsAntcFWkbQ6cek7+DPLjzOQmMAaA7egfOMM= +github.com/projectcalico/libcalico-go v1.7.2-0.20210510231246-b2f91f5ac4d6 h1:0+uriio0AppR+Qypqg0zNIOvoly6lO3YhjLwOZqhynE= +github.com/projectcalico/libcalico-go v1.7.2-0.20210510231246-b2f91f5ac4d6/go.mod h1:epPDUZnPsAntcFWkbQ6cek7+DPLjzOQmMAaA7egfOMM= github.com/projectcalico/logrus v1.0.4-calico h1:bHJ2KLGTFzoWpRISe13CO7HVxxrKunDjyUz/wFiBY8c= github.com/projectcalico/logrus v1.0.4-calico/go.mod h1:DfgrchabbtEO9wjOz5lVae+XRvjFKKWEA9GTMme6A8g= github.com/projectcalico/pod2daemon v0.0.0-20210303175725-63bffe4262de h1:jZwDXT5zBIZ21mtqdE76ArjhBwl5G4T+aoBjgkivvjk= github.com/projectcalico/pod2daemon v0.0.0-20210303175725-63bffe4262de/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= -github.com/projectcalico/typha v0.7.3-0.20210423192651-88aa888efc7e h1:YU4O4F+6idxulkoTntdvZvpF0AiCzXZpllhGZamMUjc= -github.com/projectcalico/typha v0.7.3-0.20210423192651-88aa888efc7e/go.mod h1:fkjCYYho25MbQML4pxDJ72MFrDEWppc1up57UhnNZQ0= +github.com/projectcalico/typha v0.7.3-0.20210513225950-7436545ca0e6 h1:SyPyvJE9eWQ6hu/fm0AgyrSbUCjdrdt4gjLO5coMeLk= +github.com/projectcalico/typha v0.7.3-0.20210513225950-7436545ca0e6/go.mod h1:hNehMbGqUnUsvSJZME1kMIZ4QB+7E9gnDzBQ+qvhgOo= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM= From aa18645e233d461fea7eeeee401e59024c8946e1 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Tue, 25 May 2021 09:20:30 -0700 Subject: [PATCH 2/2] update dockerfile and iptables version to get build working --- Dockerfile.amd64 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index b6cee1995..a7d6bd892 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2019 Tigera, Inc. All rights reserved. +# Copyright (c) 2015-2021 Tigera, Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,8 @@ # limitations under the License. ARG ARCH=x86_64 ARG GIT_VERSION=unknown -ARG IPTABLES_VER=1.8.2-16 +ARG IPTABLES_VER=1.8.4-15 +ARG LIBNFTNL_VER=1.1.5-4 ARG RUNIT_VER=2.1.2 ARG BIRD_IMAGE=calico/bird:latest @@ -28,9 +29,9 @@ FROM centos:8 as centos ARG ARCH ARG IPTABLES_VER +ARG LIBNFTNL_VER ARG RUNIT_VER -ARG CENTOS_MIRROR_BASE_URL=http://vault.centos.org/8.1.1911 -ARG LIBNFTNL_VER=1.1.1-4 +ARG CENTOS_MIRROR_BASE_URL=http://vault.centos.org/8.3.2011 ARG LIBNFTNL_SOURCERPM_URL=${CENTOS_MIRROR_BASE_URL}/BaseOS/Source/SPackages/libnftnl-${LIBNFTNL_VER}.el8.src.rpm ARG IPTABLES_SOURCERPM_URL=${CENTOS_MIRROR_BASE_URL}/BaseOS/Source/SPackages/iptables-${IPTABLES_VER}.el8.src.rpm @@ -93,10 +94,11 @@ RUN wget -P /tmp http://smarden.org/runit/runit-${RUNIT_VER}.tar.gz && \ cd /tmp/admin/runit-${RUNIT_VER}/ && \ package/install -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1 as ubi +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 as ubi ARG ARCH ARG GIT_VERSION ARG IPTABLES_VER +ARG LIBNFTNL_VER ARG RUNIT_VER # Update base packages to pick up security updates. Must do this before adding the centos repo. @@ -121,7 +123,7 @@ RUN rm /etc/yum.repos.d/ubi.repo && \ # Don't install copious docs. --setopt=tsflags=nodocs \ # Needed for iptables - libpcap libmnl libnfnetlink libnftnl libnetfilter_conntrack \ + libpcap libmnl libnfnetlink libnetfilter_conntrack \ ipset \ iputils \ # Need arp @@ -143,6 +145,8 @@ RUN rm /etc/yum.repos.d/ubi.repo && \ # Install iptables via rpms. The libs must be force installed because the iptables source RPM has the release # version '9.el8_0.1' while the existing iptables-libs (pulled in by the iputils package) has version '9.el8.1'. rpm --force -i /tmp/rpms/iptables-libs-${IPTABLES_VER}.el8.${ARCH}.rpm && \ + # Install compatible libnftnl version with selected iptables version + rpm --force -i /tmp/rpms/libnftnl-${LIBNFTNL_VER}.el8.${ARCH}.rpm && \ rpm -i /tmp/rpms/iptables-${IPTABLES_VER}.el8.${ARCH}.rpm && \ # Set alternatives alternatives --install /usr/sbin/iptables iptables /usr/sbin/iptables-legacy 1 && \