From 6f81929e9efe9689c6924d6c8cc1cfb2bbc674f7 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Wed, 21 Apr 2021 21:55:26 +0000 Subject: [PATCH 01/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8ac07edc..1aa04263 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo v1.14.2 github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/projectcalico/felix v0.0.0-20210420181207-2884c1e48f3d + github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6 github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 diff --git a/go.sum b/go.sum index 4b68b61b..637b6af5 100644 --- a/go.sum +++ b/go.sum @@ -592,20 +592,19 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/projectcalico/felix v0.0.0-20210420181207-2884c1e48f3d h1:Mz26p2EAEaJcT4xvmrWnkxU4VjMWAa2/7dX7Lo0El7I= -github.com/projectcalico/felix v0.0.0-20210420181207-2884c1e48f3d/go.mod h1:PV93dRGUKPh2UklkPokKoaezLjIFdpL9wiKnG16xPzs= +github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6 h1:ipqaYa7J21M2eCpuJb4JyTPvY3oz1QkUva0RVBiUJEg= +github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6/go.mod h1:wZW17roel/vSiXdebKGZmCdEoYLoVRzefHsVXM7Vgm4= 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= github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= -github.com/projectcalico/libcalico-go v1.7.2-0.20210420162340-ee8236b08c22/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b h1:+PsMdXWyKeTsv0GXk/l5umiUrcopXqYf8G2iylEeaXU= github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= -github.com/projectcalico/typha v0.7.3-0.20210420170548-18eeaeac58cf h1:N+T5CkQBx7xXIYOi7RDBdW+aIEkGkW+89UB79fekfT8= -github.com/projectcalico/typha v0.7.3-0.20210420170548-18eeaeac58cf/go.mod h1:FSeMbTkLY428xheLHBT+TFWgYl4KZ0Dc3pdqDCLhy+Q= +github.com/projectcalico/typha v0.7.3-0.20210420174856-c57b187f343b h1:PthRqxFDV9A/1haXgyrOhD5rney0vhz5pOHQq5GW3Fk= +github.com/projectcalico/typha v0.7.3-0.20210420174856-c57b187f343b/go.mod h1:pFq3fnk3O+vhW6dERTEA0hoNfM5Q2oUXncHi0y8BglU= 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/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= From 7fa7dfc098c4c3b70d63e1530a91686b3ca0f826 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Wed, 21 Apr 2021 22:14:53 +0000 Subject: [PATCH 02/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8ac07edc..1aa04263 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo v1.14.2 github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/projectcalico/felix v0.0.0-20210420181207-2884c1e48f3d + github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6 github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 diff --git a/go.sum b/go.sum index 4b68b61b..637b6af5 100644 --- a/go.sum +++ b/go.sum @@ -592,20 +592,19 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/projectcalico/felix v0.0.0-20210420181207-2884c1e48f3d h1:Mz26p2EAEaJcT4xvmrWnkxU4VjMWAa2/7dX7Lo0El7I= -github.com/projectcalico/felix v0.0.0-20210420181207-2884c1e48f3d/go.mod h1:PV93dRGUKPh2UklkPokKoaezLjIFdpL9wiKnG16xPzs= +github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6 h1:ipqaYa7J21M2eCpuJb4JyTPvY3oz1QkUva0RVBiUJEg= +github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6/go.mod h1:wZW17roel/vSiXdebKGZmCdEoYLoVRzefHsVXM7Vgm4= 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= github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= -github.com/projectcalico/libcalico-go v1.7.2-0.20210420162340-ee8236b08c22/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b h1:+PsMdXWyKeTsv0GXk/l5umiUrcopXqYf8G2iylEeaXU= github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= -github.com/projectcalico/typha v0.7.3-0.20210420170548-18eeaeac58cf h1:N+T5CkQBx7xXIYOi7RDBdW+aIEkGkW+89UB79fekfT8= -github.com/projectcalico/typha v0.7.3-0.20210420170548-18eeaeac58cf/go.mod h1:FSeMbTkLY428xheLHBT+TFWgYl4KZ0Dc3pdqDCLhy+Q= +github.com/projectcalico/typha v0.7.3-0.20210420174856-c57b187f343b h1:PthRqxFDV9A/1haXgyrOhD5rney0vhz5pOHQq5GW3Fk= +github.com/projectcalico/typha v0.7.3-0.20210420174856-c57b187f343b/go.mod h1:pFq3fnk3O+vhW6dERTEA0hoNfM5Q2oUXncHi0y8BglU= 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/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= From afc09d8d036e04beb0b2ccb0df2fbcf68384d76a Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Thu, 13 May 2021 15:58:38 -0700 Subject: [PATCH 03/17] Automatic Pin Updates (#716) Co-authored-by: marvin-tigera --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1aa04263..d31bc5d1 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6 - github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b + github.com/projectcalico/libcalico-go v1.7.2-0.20210510231255-e7440e71ec84 github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.7.0 diff --git a/go.sum b/go.sum index 637b6af5..a60dba55 100644 --- a/go.sum +++ b/go.sum @@ -600,6 +600,8 @@ github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 h1:J github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b h1:+PsMdXWyKeTsv0GXk/l5umiUrcopXqYf8G2iylEeaXU= github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= +github.com/projectcalico/libcalico-go v1.7.2-0.20210510231255-e7440e71ec84 h1:poJxQrii0xPeqLCWv8HBEUSCUhKHMPtbSmNJEjcOy8E= +github.com/projectcalico/libcalico-go v1.7.2-0.20210510231255-e7440e71ec84/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= From fa8d52cd967af2918db717e63ef3db9f9ea6354f Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Thu, 13 May 2021 16:20:33 -0700 Subject: [PATCH 04/17] Sync new serviceaccount field (#720) --- go.mod | 2 +- go.sum | 4 +- pkg/converter/pod_converter.go | 15 ++-- tests/fv/fv_test.go | 121 ++++++++++++++++++++++++++++++++- 4 files changed, 132 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index d31bc5d1..7a992bfd 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6 - github.com/projectcalico/libcalico-go v1.7.2-0.20210510231255-e7440e71ec84 + github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.7.0 diff --git a/go.sum b/go.sum index a60dba55..58a9d608 100644 --- a/go.sum +++ b/go.sum @@ -600,8 +600,8 @@ github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 h1:J github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b h1:+PsMdXWyKeTsv0GXk/l5umiUrcopXqYf8G2iylEeaXU= github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= -github.com/projectcalico/libcalico-go v1.7.2-0.20210510231255-e7440e71ec84 h1:poJxQrii0xPeqLCWv8HBEUSCUhKHMPtbSmNJEjcOy8E= -github.com/projectcalico/libcalico-go v1.7.2-0.20210510231255-e7440e71ec84/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= +github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d h1:DLMW6eSAQ+Zs+AP8KnKL4Tb4w/dYP1VTKvhE3cQVtF8= +github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= diff --git a/pkg/converter/pod_converter.go b/pkg/converter/pod_converter.go index 9e1a9905..5b00f4e3 100644 --- a/pkg/converter/pod_converter.go +++ b/pkg/converter/pod_converter.go @@ -32,9 +32,10 @@ import ( // WorkloadEndpointData is an internal struct used to store the various bits // of information that the policy controller cares about on a workload endpoint. type WorkloadEndpointData struct { - PodName string - Namespace string - Labels map[string]string + PodName string + Namespace string + Labels map[string]string + ServiceAccount string } type PodConverter interface { @@ -52,9 +53,10 @@ func BuildWorkloadEndpointData(weps ...api.WorkloadEndpoint) []WorkloadEndpointD var retWEPs []WorkloadEndpointData for _, wep := range weps { retWEPs = append(retWEPs, WorkloadEndpointData{ - PodName: wep.Spec.Pod, - Namespace: wep.Namespace, - Labels: wep.Labels, + PodName: wep.Spec.Pod, + Namespace: wep.Namespace, + Labels: wep.Labels, + ServiceAccount: wep.Spec.ServiceAccountName, }) } @@ -68,6 +70,7 @@ func MergeWorkloadEndpointData(wep *api.WorkloadEndpoint, upd WorkloadEndpointDa log.Fatalf("Bad attempt to merge data for %s/%s into wep %s/%s", upd.PodName, upd.Namespace, wep.Name, wep.Namespace) } wep.Labels = upd.Labels + wep.Spec.ServiceAccountName = upd.ServiceAccount } // NewPodConverter Constructor for podConverter diff --git a/tests/fv/fv_test.go b/tests/fv/fv_test.go index 1976f496..baa1ee66 100644 --- a/tests/fv/fv_test.go +++ b/tests/fv/fv_test.go @@ -944,6 +944,125 @@ var _ = Describe("kube-controllers FV tests", func() { Expect(w.Spec.ContainerID).To(Equal("container-id-2")) }) }) + + It("should update serviceaccount appropriately", func() { + longName := "long-service-account-name-that-exceeds-the-character-limit-for-kubernetes-labels" + podNamespace := "default" + + // Create serviceaccount. + sa := &v1.ServiceAccount{ + ObjectMeta: metav1.ObjectMeta{ + Name: longName, + Namespace: podNamespace, + }, + } + Eventually(func() error { + _, err := k8sClient.CoreV1().ServiceAccounts(podNamespace).Create( + context.Background(), + sa, + metav1.CreateOptions{}, + ) + return err + }, time.Second*10, 500*time.Millisecond).ShouldNot(HaveOccurred()) + + // Create a Pod + podName := fmt.Sprintf("pod-fv-container-id-%s", uuid.NewV4()) + nodeName := "127.0.0.1" + pod := v1.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Name: podName, + Namespace: podNamespace, + Labels: map[string]string{ + "foo": "label1", + }, + }, + Spec: v1.PodSpec{ + NodeName: nodeName, + ServiceAccountName: longName, + Containers: []v1.Container{ + { + Name: "container1", + Image: "busybox", + Command: []string{"sleep", "3600"}, + }, + }, + }, + } + + By("creating a Pod in the k8s API", func() { + Eventually(func() error { + _, err := k8sClient.CoreV1().Pods("default").Create(context.Background(), + &pod, metav1.CreateOptions{}) + return err + }, "20s", "2s").ShouldNot(HaveOccurred()) + }) + + By("updating the pod's status to be running", func() { + pod.Status.PodIP = "192.168.1.1" + pod.Status.Phase = v1.PodRunning + _, err := k8sClient.CoreV1().Pods("default").UpdateStatus(context.Background(), + &pod, metav1.UpdateOptions{}) + Expect(err).NotTo(HaveOccurred()) + }) + + // Mock the job of the CNI plugin by creating the wep in etcd, providing a container ID. + wepIDs := names.WorkloadEndpointIdentifiers{ + Node: pod.Spec.NodeName, + Orchestrator: "k8s", + Endpoint: "eth0", + Pod: pod.Name, + } + wepName, err := wepIDs.CalculateWorkloadEndpointName(false) + Expect(err).NotTo(HaveOccurred()) + wep := api.NewWorkloadEndpoint() + wep.Name = wepName + wep.Namespace = podNamespace + wep.Labels = map[string]string{ + "foo": "label1", + "projectcalico.org/namespace": podNamespace, + "projectcalico.org/orchestrator": api.OrchestratorKubernetes, + } + wep.Spec = api.WorkloadEndpointSpec{ + ContainerID: "container-id-1", + Orchestrator: "k8s", + Pod: podName, + Node: nodeName, + Endpoint: "eth0", + IPNetworks: []string{"192.168.1.1/32"}, + InterfaceName: "testInterface", + } + + By("creating a corresponding workload endpoint", func() { + _, err := calicoClient.WorkloadEndpoints().Create(context.Background(), wep, options.SetOptions{}) + Expect(err).NotTo(HaveOccurred()) + }) + + By("updating the pod's labels to trigger a cache update", func() { + // Definitively trigger a pod controller cache update by updating the pod's labels + // in the Kubernetes API. This ensures the controller has the cached WEP with container-id-1. + podNow, err := k8sClient.CoreV1().Pods("default").Get(context.Background(), podName, metav1.GetOptions{}) + Expect(err).NotTo(HaveOccurred()) + pod = *podNow + pod.Labels["foo"] = "label2" + _, err = k8sClient.CoreV1().Pods("default").Update(context.Background(), + &pod, metav1.UpdateOptions{}) + Expect(err).NotTo(HaveOccurred()) + }) + + By("waiting for the new servcieaccount to appear on the WEP", func() { + Eventually(func() error { + w, err := calicoClient.WorkloadEndpoints().Get(context.Background(), wep.Namespace, wep.Name, options.GetOptions{}) + if err != nil { + return err + } + + if w.Spec.ServiceAccountName != longName { + return fmt.Errorf("ServiceAccountName not updated. Current value: %s", w.Spec.ServiceAccountName) + } + return nil + }, 15*time.Second).ShouldNot(HaveOccurred()) + }) + }) }) It("should not create a workload endpoint when one does not already exist", func() { @@ -960,7 +1079,7 @@ var _ = Describe("kube-controllers FV tests", func() { Spec: v1.PodSpec{ NodeName: "127.0.0.1", Containers: []v1.Container{ - v1.Container{ + { Name: "container1", Image: "busybox", Command: []string{"sleep", "3600"}, From ee0b08fbc1d710338de380ea79328f47ccbca7d5 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Thu, 13 May 2021 23:21:06 +0000 Subject: [PATCH 05/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d31bc5d1..7a992bfd 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6 - github.com/projectcalico/libcalico-go v1.7.2-0.20210510231255-e7440e71ec84 + github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.7.0 diff --git a/go.sum b/go.sum index a60dba55..58a9d608 100644 --- a/go.sum +++ b/go.sum @@ -600,8 +600,8 @@ github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 h1:J github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b h1:+PsMdXWyKeTsv0GXk/l5umiUrcopXqYf8G2iylEeaXU= github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= -github.com/projectcalico/libcalico-go v1.7.2-0.20210510231255-e7440e71ec84 h1:poJxQrii0xPeqLCWv8HBEUSCUhKHMPtbSmNJEjcOy8E= -github.com/projectcalico/libcalico-go v1.7.2-0.20210510231255-e7440e71ec84/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= +github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d h1:DLMW6eSAQ+Zs+AP8KnKL4Tb4w/dYP1VTKvhE3cQVtF8= +github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= From 39f9af0ba78106566d538598692e14852ac3b5a9 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Fri, 14 May 2021 00:03:27 +0000 Subject: [PATCH 06/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 7a992bfd..ec2b72f9 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo v1.14.2 github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6 + github.com/projectcalico/felix v0.0.0-20210513235642-a81e1a3c8b4d github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 diff --git a/go.sum b/go.sum index 58a9d608..1a3a20bd 100644 --- a/go.sum +++ b/go.sum @@ -592,21 +592,20 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6 h1:ipqaYa7J21M2eCpuJb4JyTPvY3oz1QkUva0RVBiUJEg= -github.com/projectcalico/felix v0.0.0-20210421162248-7a38390c65b6/go.mod h1:wZW17roel/vSiXdebKGZmCdEoYLoVRzefHsVXM7Vgm4= +github.com/projectcalico/felix v0.0.0-20210513235642-a81e1a3c8b4d h1:z5bsLoCBgLJwXyQ1K/LJXKTZCAwzMPYQf6I2WaM39eY= +github.com/projectcalico/felix v0.0.0-20210513235642-a81e1a3c8b4d/go.mod h1:1TgeUTXh81cVisV3ESEZSJDZoB16MfCIBnPn8isjNJ0= 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= github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= -github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b h1:+PsMdXWyKeTsv0GXk/l5umiUrcopXqYf8G2iylEeaXU= -github.com/projectcalico/libcalico-go v1.7.2-0.20210420172941-9c7cafdba48b/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= +github.com/projectcalico/libcalico-go v1.7.2-0.20210510231255-e7440e71ec84/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d h1:DLMW6eSAQ+Zs+AP8KnKL4Tb4w/dYP1VTKvhE3cQVtF8= github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= -github.com/projectcalico/typha v0.7.3-0.20210420174856-c57b187f343b h1:PthRqxFDV9A/1haXgyrOhD5rney0vhz5pOHQq5GW3Fk= -github.com/projectcalico/typha v0.7.3-0.20210420174856-c57b187f343b/go.mod h1:pFq3fnk3O+vhW6dERTEA0hoNfM5Q2oUXncHi0y8BglU= +github.com/projectcalico/typha v0.7.3-0.20210513225047-2bbd6051860d h1:dbXEeX7arp0jO4FC+f9EaxO8qyGuXSd9jlkHQW4nCs8= +github.com/projectcalico/typha v0.7.3-0.20210513225047-2bbd6051860d/go.mod h1:UQqPDIeukt1kMc2A5KPE6+lo9DV+RUBB3yzPOTd70Xc= 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/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= From 395be24e680ab29c5f85c047110ecc4d50ebfe16 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Thu, 20 May 2021 17:13:18 +0000 Subject: [PATCH 07/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index ec2b72f9..a5334ed6 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo v1.14.2 github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/projectcalico/felix v0.0.0-20210513235642-a81e1a3c8b4d + github.com/projectcalico/felix v0.0.0-20210514180456-c47545c56459 github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 diff --git a/go.sum b/go.sum index 1a3a20bd..c30a738c 100644 --- a/go.sum +++ b/go.sum @@ -592,20 +592,19 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/projectcalico/felix v0.0.0-20210513235642-a81e1a3c8b4d h1:z5bsLoCBgLJwXyQ1K/LJXKTZCAwzMPYQf6I2WaM39eY= -github.com/projectcalico/felix v0.0.0-20210513235642-a81e1a3c8b4d/go.mod h1:1TgeUTXh81cVisV3ESEZSJDZoB16MfCIBnPn8isjNJ0= +github.com/projectcalico/felix v0.0.0-20210514180456-c47545c56459 h1:HWyDqsu4AGnaqqRt8xubeEowGpYZ7Knd8w/eWCMyTjI= +github.com/projectcalico/felix v0.0.0-20210514180456-c47545c56459/go.mod h1:v14Oq+TvTUKmRHYPSmHGZ59CU8OLUEGNf7nbd6r6cYA= 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= github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= -github.com/projectcalico/libcalico-go v1.7.2-0.20210510231255-e7440e71ec84/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d h1:DLMW6eSAQ+Zs+AP8KnKL4Tb4w/dYP1VTKvhE3cQVtF8= github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= -github.com/projectcalico/typha v0.7.3-0.20210513225047-2bbd6051860d h1:dbXEeX7arp0jO4FC+f9EaxO8qyGuXSd9jlkHQW4nCs8= -github.com/projectcalico/typha v0.7.3-0.20210513225047-2bbd6051860d/go.mod h1:UQqPDIeukt1kMc2A5KPE6+lo9DV+RUBB3yzPOTd70Xc= +github.com/projectcalico/typha v0.7.3-0.20210513232525-547afbed117b h1:YWM/SV88TKKmVr7geGo7fWpn6rPtHD+lXyiVcRr5G74= +github.com/projectcalico/typha v0.7.3-0.20210513232525-547afbed117b/go.mod h1:I+oj/nGZNSbudpsicNsr1Hi7lbNgBYEHMH0WUZNEWhY= 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/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= From 170cb7953cbd6267003d60e77ab2fecfc0f193e7 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Wed, 26 May 2021 17:54:30 +0000 Subject: [PATCH 08/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a5334ed6..7c22c88a 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo v1.14.2 github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/projectcalico/felix v0.0.0-20210514180456-c47545c56459 + github.com/projectcalico/felix v0.0.0-20210521123545-0e7ed6900dea github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 diff --git a/go.sum b/go.sum index c30a738c..1dfd0fc9 100644 --- a/go.sum +++ b/go.sum @@ -592,8 +592,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/projectcalico/felix v0.0.0-20210514180456-c47545c56459 h1:HWyDqsu4AGnaqqRt8xubeEowGpYZ7Knd8w/eWCMyTjI= -github.com/projectcalico/felix v0.0.0-20210514180456-c47545c56459/go.mod h1:v14Oq+TvTUKmRHYPSmHGZ59CU8OLUEGNf7nbd6r6cYA= +github.com/projectcalico/felix v0.0.0-20210521123545-0e7ed6900dea h1:RV9XLnCgodLOWQiSZ2Spt/QSthcvI+LSUfTVCJxZbok= +github.com/projectcalico/felix v0.0.0-20210521123545-0e7ed6900dea/go.mod h1:rq9n9KvjqPNlz7DyZw7/YrqK4MEX2uWbrrpK1Glo06k= 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= @@ -634,6 +634,7 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quobyte/api v0.1.8/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= +github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -1167,6 +1168,8 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= +modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc= modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= From 8b1a0ec83f72b45866c56e0008619c94b3aa1098 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Mon, 12 Jul 2021 17:56:14 +0000 Subject: [PATCH 09/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7c22c88a..52214f9f 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/projectcalico/felix v0.0.0-20210521123545-0e7ed6900dea - github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d + github.com/projectcalico/libcalico-go v1.7.2-0.20210712175406-9041b53c6f24 github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.7.0 diff --git a/go.sum b/go.sum index 1dfd0fc9..dfc3eeab 100644 --- a/go.sum +++ b/go.sum @@ -600,6 +600,8 @@ github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 h1:J github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d h1:DLMW6eSAQ+Zs+AP8KnKL4Tb4w/dYP1VTKvhE3cQVtF8= github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= +github.com/projectcalico/libcalico-go v1.7.2-0.20210712175406-9041b53c6f24 h1:ewlLJ8gMrzzFsp9yfNBi7vq1j6K8okh7gyH0ESq1NB0= +github.com/projectcalico/libcalico-go v1.7.2-0.20210712175406-9041b53c6f24/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= From 0a9e727b2a8c24f301bff2572dac5a0dad3eaae5 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Wed, 14 Jul 2021 23:15:16 +0000 Subject: [PATCH 10/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 52214f9f..f94c0aab 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/projectcalico/felix v0.0.0-20210521123545-0e7ed6900dea - github.com/projectcalico/libcalico-go v1.7.2-0.20210712175406-9041b53c6f24 + github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.7.0 diff --git a/go.sum b/go.sum index dfc3eeab..8c15a1e0 100644 --- a/go.sum +++ b/go.sum @@ -600,8 +600,8 @@ github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 h1:J github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d h1:DLMW6eSAQ+Zs+AP8KnKL4Tb4w/dYP1VTKvhE3cQVtF8= github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= -github.com/projectcalico/libcalico-go v1.7.2-0.20210712175406-9041b53c6f24 h1:ewlLJ8gMrzzFsp9yfNBi7vq1j6K8okh7gyH0ESq1NB0= -github.com/projectcalico/libcalico-go v1.7.2-0.20210712175406-9041b53c6f24/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= +github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d h1:0C8ZHSF4M5PGScqDIerfQxn4p8Oy32E7s+CxsBKmekI= +github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= From f15b57d79b4c91d867276b4eebaeaf65462be18c Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Thu, 15 Jul 2021 18:42:49 +0000 Subject: [PATCH 11/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f94c0aab..19c371c6 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo v1.14.2 github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/projectcalico/felix v0.0.0-20210521123545-0e7ed6900dea + github.com/projectcalico/felix v0.0.0-20210715021823-7f6e091aa303 github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 diff --git a/go.sum b/go.sum index 8c15a1e0..05d7f48d 100644 --- a/go.sum +++ b/go.sum @@ -592,8 +592,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/projectcalico/felix v0.0.0-20210521123545-0e7ed6900dea h1:RV9XLnCgodLOWQiSZ2Spt/QSthcvI+LSUfTVCJxZbok= -github.com/projectcalico/felix v0.0.0-20210521123545-0e7ed6900dea/go.mod h1:rq9n9KvjqPNlz7DyZw7/YrqK4MEX2uWbrrpK1Glo06k= +github.com/projectcalico/felix v0.0.0-20210715021823-7f6e091aa303 h1:um4bN0H99tmmGmz/7T3TLwKmjD71r2A5moLJRcxFDMo= +github.com/projectcalico/felix v0.0.0-20210715021823-7f6e091aa303/go.mod h1:EdaaGS8qrAtCKVuAFxavAS3jN9HuKB9OSnNnXHMR29M= 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= From e0f5c12c456c03d11f0c9a905fb7213ac20ecf18 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Thu, 22 Jul 2021 21:51:15 +0000 Subject: [PATCH 12/17] Automatic Pin Updates --- go.mod | 4 ++-- go.sum | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 19c371c6..1a312c01 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/onsi/ginkgo v1.14.2 github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/projectcalico/felix v0.0.0-20210715021823-7f6e091aa303 - github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d + github.com/projectcalico/felix v0.0.0-20210721001314-8dbbb8d5f84e + github.com/projectcalico/libcalico-go v1.7.2-0.20210722214910-036a2cd30ed7 github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.7.0 diff --git a/go.sum b/go.sum index 05d7f48d..a2e9a31e 100644 --- a/go.sum +++ b/go.sum @@ -592,21 +592,21 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/projectcalico/felix v0.0.0-20210715021823-7f6e091aa303 h1:um4bN0H99tmmGmz/7T3TLwKmjD71r2A5moLJRcxFDMo= -github.com/projectcalico/felix v0.0.0-20210715021823-7f6e091aa303/go.mod h1:EdaaGS8qrAtCKVuAFxavAS3jN9HuKB9OSnNnXHMR29M= +github.com/projectcalico/felix v0.0.0-20210721001314-8dbbb8d5f84e h1:c1Vxq2OKlNHAvrRp97u6yfEgdgsdHcioM5SHP40mrWw= +github.com/projectcalico/felix v0.0.0-20210721001314-8dbbb8d5f84e/go.mod h1:7I51jNvPMAadgGAOuVDksGhAhCG0TwpADs4hx8I58pM= 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= github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= -github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d h1:DLMW6eSAQ+Zs+AP8KnKL4Tb4w/dYP1VTKvhE3cQVtF8= -github.com/projectcalico/libcalico-go v1.7.2-0.20210513174936-6ccf0906db1d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d h1:0C8ZHSF4M5PGScqDIerfQxn4p8Oy32E7s+CxsBKmekI= github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= +github.com/projectcalico/libcalico-go v1.7.2-0.20210722214910-036a2cd30ed7 h1:7dnktogK6ehEKuzCzxtDQ9VXMg+JDBRfey7reIktt6k= +github.com/projectcalico/libcalico-go v1.7.2-0.20210722214910-036a2cd30ed7/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= -github.com/projectcalico/typha v0.7.3-0.20210513232525-547afbed117b h1:YWM/SV88TKKmVr7geGo7fWpn6rPtHD+lXyiVcRr5G74= -github.com/projectcalico/typha v0.7.3-0.20210513232525-547afbed117b/go.mod h1:I+oj/nGZNSbudpsicNsr1Hi7lbNgBYEHMH0WUZNEWhY= +github.com/projectcalico/typha v0.7.3-0.20210720230628-a1e573fdd3ca h1:SHkdVnz6/FLmn0M58XRw70W/ejz2gNxyr2lxXoSsbc0= +github.com/projectcalico/typha v0.7.3-0.20210720230628-a1e573fdd3ca/go.mod h1:PMyC8JmFiLIiSybiGzyFh0+lSseIn9PWRmTFuqfsD1E= 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/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= From c6a0733ccb4c3cd222675c3e09e5b9c9ab57ac82 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Wed, 28 Jul 2021 18:11:03 +0000 Subject: [PATCH 13/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1a312c01..0716ae2c 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/projectcalico/felix v0.0.0-20210721001314-8dbbb8d5f84e - github.com/projectcalico/libcalico-go v1.7.2-0.20210722214910-036a2cd30ed7 + github.com/projectcalico/libcalico-go v1.7.2-0.20210728180906-a1e445240f99 github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.7.0 diff --git a/go.sum b/go.sum index a2e9a31e..95261fbc 100644 --- a/go.sum +++ b/go.sum @@ -600,8 +600,8 @@ github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 h1:J github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d h1:0C8ZHSF4M5PGScqDIerfQxn4p8Oy32E7s+CxsBKmekI= github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= -github.com/projectcalico/libcalico-go v1.7.2-0.20210722214910-036a2cd30ed7 h1:7dnktogK6ehEKuzCzxtDQ9VXMg+JDBRfey7reIktt6k= -github.com/projectcalico/libcalico-go v1.7.2-0.20210722214910-036a2cd30ed7/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= +github.com/projectcalico/libcalico-go v1.7.2-0.20210728180906-a1e445240f99 h1:n89xz50uPXiTHWsVp3yKwmnREBEmKnaJ6CdNYLaUIu8= +github.com/projectcalico/libcalico-go v1.7.2-0.20210728180906-a1e445240f99/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= From 734547ac6be885be9c55e3ab6952efb162e1a4b5 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Tue, 17 Aug 2021 21:21:51 +0000 Subject: [PATCH 14/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 0716ae2c..67cc9d22 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo v1.14.2 github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/projectcalico/felix v0.0.0-20210721001314-8dbbb8d5f84e + github.com/projectcalico/felix v0.0.0-20210803232934-9f571d73f5bc github.com/projectcalico/libcalico-go v1.7.2-0.20210728180906-a1e445240f99 github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 diff --git a/go.sum b/go.sum index 95261fbc..a9e9352d 100644 --- a/go.sum +++ b/go.sum @@ -592,21 +592,19 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/projectcalico/felix v0.0.0-20210721001314-8dbbb8d5f84e h1:c1Vxq2OKlNHAvrRp97u6yfEgdgsdHcioM5SHP40mrWw= -github.com/projectcalico/felix v0.0.0-20210721001314-8dbbb8d5f84e/go.mod h1:7I51jNvPMAadgGAOuVDksGhAhCG0TwpADs4hx8I58pM= +github.com/projectcalico/felix v0.0.0-20210803232934-9f571d73f5bc h1:xEcQfwpAXLr4z8Zb5+/IcCWUIyep2KaJfNVy1Iuyww4= +github.com/projectcalico/felix v0.0.0-20210803232934-9f571d73f5bc/go.mod h1:eZoAh3YTQo8i8yk7kB+Fj8nmgiitGZcwe4y3mOCHJeI= 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= github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc= -github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d h1:0C8ZHSF4M5PGScqDIerfQxn4p8Oy32E7s+CxsBKmekI= -github.com/projectcalico/libcalico-go v1.7.2-0.20210714231326-408f9354c22d/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= github.com/projectcalico/libcalico-go v1.7.2-0.20210728180906-a1e445240f99 h1:n89xz50uPXiTHWsVp3yKwmnREBEmKnaJ6CdNYLaUIu8= github.com/projectcalico/libcalico-go v1.7.2-0.20210728180906-a1e445240f99/go.mod h1:CA54aw5b1PXwBWsl4k98ovXcLg8lw2X7OxiEqjjexFM= 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= -github.com/projectcalico/typha v0.7.3-0.20210720230628-a1e573fdd3ca h1:SHkdVnz6/FLmn0M58XRw70W/ejz2gNxyr2lxXoSsbc0= -github.com/projectcalico/typha v0.7.3-0.20210720230628-a1e573fdd3ca/go.mod h1:PMyC8JmFiLIiSybiGzyFh0+lSseIn9PWRmTFuqfsD1E= +github.com/projectcalico/typha v0.7.3-0.20210803164522-5df1b7ef0402 h1:ULw+ZCb11brM+nUNkJQha0fehSc5xX2bRWC0La3cNkI= +github.com/projectcalico/typha v0.7.3-0.20210803164522-5df1b7ef0402/go.mod h1:QphGM3APHauWRrNxzyLsHfw+opw0jKpx003sI2qwz8E= 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/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= From 2fb7ce1713b7b5c77d1cbbb343ead4aebe551801 Mon Sep 17 00:00:00 2001 From: marvin-tigera Date: Tue, 28 Sep 2021 00:29:43 +0000 Subject: [PATCH 15/17] Automatic Pin Updates --- go.mod | 2 +- go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 67cc9d22..0e8f236e 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo v1.14.2 github.com/onsi/gomega v1.10.4 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/projectcalico/felix v0.0.0-20210803232934-9f571d73f5bc + github.com/projectcalico/felix v0.0.0-20210819135647-a6a97d0222fe github.com/projectcalico/libcalico-go v1.7.2-0.20210728180906-a1e445240f99 github.com/prometheus/client_golang v1.7.1 github.com/satori/go.uuid v1.2.0 diff --git a/go.sum b/go.sum index a9e9352d..8afabf36 100644 --- a/go.sum +++ b/go.sum @@ -592,8 +592,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/projectcalico/felix v0.0.0-20210803232934-9f571d73f5bc h1:xEcQfwpAXLr4z8Zb5+/IcCWUIyep2KaJfNVy1Iuyww4= -github.com/projectcalico/felix v0.0.0-20210803232934-9f571d73f5bc/go.mod h1:eZoAh3YTQo8i8yk7kB+Fj8nmgiitGZcwe4y3mOCHJeI= +github.com/projectcalico/felix v0.0.0-20210819135647-a6a97d0222fe h1:YprR0iq3dQQxS2rElb5Sz3VtW6/7v//ArrnMUsKZLmc= +github.com/projectcalico/felix v0.0.0-20210819135647-a6a97d0222fe/go.mod h1:p/qb+daHKPOm8cGcKdEoGVHlRENVy6Bl2sMQFa0Qq8Y= 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= @@ -603,8 +603,8 @@ github.com/projectcalico/libcalico-go v1.7.2-0.20210728180906-a1e445240f99/go.mo 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-20210416195010-6f2d574230b3/go.mod h1:96lk2GRh7Z5QdPGRmZMC6DRxEOToaAlS+emdl4WiMPM= -github.com/projectcalico/typha v0.7.3-0.20210803164522-5df1b7ef0402 h1:ULw+ZCb11brM+nUNkJQha0fehSc5xX2bRWC0La3cNkI= -github.com/projectcalico/typha v0.7.3-0.20210803164522-5df1b7ef0402/go.mod h1:QphGM3APHauWRrNxzyLsHfw+opw0jKpx003sI2qwz8E= +github.com/projectcalico/typha v0.7.3-0.20210818152856-7b2e4b5609f1 h1:JIekGU2JxwHCqdBVRZIUUWCG89Hz6VJGjQpHglx26+0= +github.com/projectcalico/typha v0.7.3-0.20210818152856-7b2e4b5609f1/go.mod h1:QphGM3APHauWRrNxzyLsHfw+opw0jKpx003sI2qwz8E= 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/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= From 5a4f89a4009be9fdc4c27198a905ee7e79424e71 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Wed, 2 Feb 2022 10:52:55 -0800 Subject: [PATCH 16/17] Update UBI to 8.5 and go-build to v0.54 --- Dockerfile.amd64 | 2 +- Makefile | 2 +- docker-images/flannel-migration/Dockerfile.amd64 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index b22abb53..9a24236d 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -13,7 +13,7 @@ # limitations under the License. ARG GIT_VERSION=unknown -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as base +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5 as base # Add in top-level license file RUN mkdir /licenses diff --git a/Makefile b/Makefile index 3f7ccf74..35139374 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PACKAGE_NAME=github.com/projectcalico/kube-controllers -GO_BUILD_VER=v0.51 +GO_BUILD_VER=v0.54 ORGANIZATION=projectcalico SEMAPHORE_PROJECT_ID?=$(SEMAPHORE_KUBE_CONTROLLERS_PROJECT_ID) diff --git a/docker-images/flannel-migration/Dockerfile.amd64 b/docker-images/flannel-migration/Dockerfile.amd64 index e309338e..b4d9bb9d 100644 --- a/docker-images/flannel-migration/Dockerfile.amd64 +++ b/docker-images/flannel-migration/Dockerfile.amd64 @@ -13,7 +13,7 @@ # limitations under the License. ARG GIT_VERSION=unknown -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as base +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5 as base # Add in top-level license file RUN mkdir /licenses From 03e1c3a8d2337e9f6b2f7529e3b9ced1a859b7bb Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Thu, 3 Feb 2022 13:54:38 -0800 Subject: [PATCH 17/17] Revert to go-build v0.51 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 35139374..3f7ccf74 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PACKAGE_NAME=github.com/projectcalico/kube-controllers -GO_BUILD_VER=v0.54 +GO_BUILD_VER=v0.51 ORGANIZATION=projectcalico SEMAPHORE_PROJECT_ID?=$(SEMAPHORE_KUBE_CONTROLLERS_PROJECT_ID)