From 7c66c757dcc3b109d9821906f45fce3c81eaca67 Mon Sep 17 00:00:00 2001 From: Alex Palesandro Date: Fri, 14 May 2021 13:37:22 +0200 Subject: [PATCH] Bump controller-runtime --- README.md | 6 ++-- cmd/liqonet/main.go | 3 +- go.mod | 6 +--- go.sum | 32 ++++++++----------- .../foreignclusterWatcher.go | 6 ++-- .../tunnelEndpointCreator/secretWatcher.go | 4 +-- .../tunnelEndpointCreator/serviceWatcher.go | 4 +-- .../tunnelEndpointCreator-operator.go | 8 ++--- .../manage_namespace_labels.go | 12 +++---- .../namespace_controller.go | 2 +- .../namespaceMap_controller.go | 2 +- .../virtualNode-controller/node_controller.go | 18 +++++------ pkg/virtualKubelet/node/module/api/exec.go | 6 ++-- pkg/virtualKubelet/provider/pods.go | 6 ++-- test/e2e/util/util.go | 9 +++--- .../config-watcher_test.go | 4 +-- .../advertisement-operator/creation_test.go | 7 ++-- test/unit/crdReplicator/env_test.go | 4 +-- 18 files changed, 67 insertions(+), 72 deletions(-) diff --git a/README.md b/README.md index 459f90523a..5a88e85e6d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@

Integration Pipeline Status - - - + + + diff --git a/cmd/liqonet/main.go b/cmd/liqonet/main.go index d70e1891ca..acc461e8b0 100644 --- a/cmd/liqonet/main.go +++ b/cmd/liqonet/main.go @@ -57,7 +57,8 @@ func main() { flag.StringVar(&metricsAddr, "metrics-addr", ":0", "The address the metric endpoint binds to.") flag.BoolVar(&enableLeaderElection, "enable-leader-election", false, "Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager.") - flag.StringVar(&runAs, "run-as", "tunnel-operator", "The accepted values are: liqo-gateway, liqo-route, tunnelEndpointCreator-operator. The default value is \"tunnel-operator\"") + flag.StringVar(&runAs, "run-as", "tunnel-operator", + "The accepted values are: liqo-gateway, liqo-route, tunnelEndpointCreator-operator. The default value is \"tunnel-operator\"") flag.Parse() mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ MapperProvider: mapperUtils.LiqoMapperProvider(scheme), diff --git a/go.mod b/go.mod index 6d4e8a3792..67e23e9625 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.16 require ( cloud.google.com/go v0.56.0 // indirect github.com/coreos/go-iptables v0.4.5 - github.com/go-logr/zapr v0.4.0 // indirect github.com/google/go-cmp v0.5.3 github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.2.0 @@ -21,8 +20,6 @@ require ( github.com/onsi/ginkgo v1.15.2 github.com/onsi/gomega v1.11.0 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.8.0 // indirect - github.com/prometheus/common v0.15.0 // indirect github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.1.1 github.com/spf13/pflag v1.0.5 @@ -30,7 +27,6 @@ require ( github.com/vishvananda/netlink v1.1.0 go.opencensus.io v0.23.0 go.uber.org/multierr v1.6.0 // indirect - go.uber.org/zap v1.16.0 // indirect golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e golang.org/x/tools v0.1.0 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200609130330-bd2cb7843e1b @@ -46,7 +42,7 @@ require ( k8s.io/kubernetes v1.21.0 k8s.io/metrics v0.21.0 k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 - sigs.k8s.io/controller-runtime v0.8.3 + sigs.k8s.io/controller-runtime v0.9.0-beta.2 ) replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0 diff --git a/go.sum b/go.sum index 431b049341..0c750fdc6a 100644 --- a/go.sum +++ b/go.sum @@ -345,10 +345,8 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= github.com/go-logr/zapr v0.4.0 h1:uc1uML3hRYL9/ZZPdgHS/n8Nzo+eaYL/Efxkkamf7OM= github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -482,8 +480,8 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/gnostic v0.2.2/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM= -github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/googleapis/gnostic v0.5.4 h1:ynbQIWjLw7iv6HAFdixb30U7Uvcmx+f4KlLJpmhkTK0= +github.com/googleapis/gnostic v0.5.4/go.mod h1:TRWw1s4gxBGjSe301Dai3c7wXJAZy57+/6tawkOvqHQ= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= @@ -543,8 +541,9 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= @@ -728,7 +727,7 @@ github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= github.com/onsi/ginkgo v1.15.2 h1:l77YT15o814C2qVL47NOyjV/6RbaP7kKdrvZnxQ3Org= github.com/onsi/ginkgo v1.15.2/go.mod h1:Dd6YFfwBW84ETqqtL0CPyPXillHgY6XhQH3uuCCTr/o= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -738,7 +737,7 @@ github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= github.com/onsi/gomega v1.11.0 h1:+CqWgvj0OZycCaqclBD1pxKHAU+tOkHmQIWvDHq2aug= github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= @@ -803,8 +802,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.8.0 h1:zvJNkoCFAnYFNC24FV8nW4JdRJ3GIFcLbg65lL/JDcw= -github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM= +github.com/prometheus/client_golang v1.9.0 h1:Rrch9mh17XcxvEu9D9DEpb4isxjGBtcevQjKvxPRQIU= +github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -821,7 +820,6 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -987,10 +985,8 @@ go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKY go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go4.org/intern v0.0.0-20210108033219-3eb7198706b2 h1:VFTf+jjIgsldaz/Mr00VaCSswHJrI2hIjQygE/W4IMg= @@ -1190,7 +1186,6 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1199,10 +1194,10 @@ golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1320,8 +1315,8 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1347,6 +1342,7 @@ google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a h1:pOwg4OoaRYScjmR4LlLgdtnyoHYTSAVhhqe5uPdpII8= google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -1494,8 +1490,8 @@ rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/controller-runtime v0.8.3 h1:GMHvzjTmaWHQB8HadW+dIvBoJuLvZObYJ5YoZruPRao= -sigs.k8s.io/controller-runtime v0.8.3/go.mod h1:U/l+DUopBc1ecfRZ5aviA9JDmGFQKvLf5YkZNx2e0sU= +sigs.k8s.io/controller-runtime v0.9.0-beta.2 h1:T2sG4AGBWKRsUJyEeMRsIpAdn/1Tqk+3J7KSJB4pWPo= +sigs.k8s.io/controller-runtime v0.9.0-beta.2/go.mod h1:ufPDuvefw2Y1KnBgHQrLdOjueYlj+XJV2AszbT+WTxs= sigs.k8s.io/kustomize/api v0.8.5/go.mod h1:M377apnKT5ZHJS++6H4rQoCHmWtt6qTpp3mbe7p6OLY= sigs.k8s.io/kustomize/cmd/config v0.9.7/go.mod h1:MvXCpHs77cfyxRmCNUQjIqCmZyYsbn5PyQpWiq44nW0= sigs.k8s.io/kustomize/kustomize/v4 v4.0.5/go.mod h1:C7rYla7sI8EnxHE/xEhRBSHMNfcL91fx0uKmUlUhrBk= diff --git a/internal/liqonet/tunnelEndpointCreator/foreignclusterWatcher.go b/internal/liqonet/tunnelEndpointCreator/foreignclusterWatcher.go index 75ff02a16c..4da7e4713e 100644 --- a/internal/liqonet/tunnelEndpointCreator/foreignclusterWatcher.go +++ b/internal/liqonet/tunnelEndpointCreator/foreignclusterWatcher.go @@ -1,6 +1,8 @@ package tunnelEndpointCreator import ( + "context" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/dynamic/dynamicinformer" @@ -16,8 +18,8 @@ func (tec *TunnelEndpointCreator) StartForeignClusterWatcher() { tec.WaitConfig.Wait() klog.Infof("Operator configured: ForeignClusterWatcher is now starting") } - chacheChan := make(chan struct{}) - started := tec.Manager.GetCache().WaitForCacheSync(chacheChan) + ctx := context.Background() + started := tec.Manager.GetCache().WaitForCacheSync(ctx) if !started { klog.Errorf("unable to sync caches") return diff --git a/internal/liqonet/tunnelEndpointCreator/secretWatcher.go b/internal/liqonet/tunnelEndpointCreator/secretWatcher.go index a0b3eacd7a..3f9b5ec8cc 100644 --- a/internal/liqonet/tunnelEndpointCreator/secretWatcher.go +++ b/internal/liqonet/tunnelEndpointCreator/secretWatcher.go @@ -25,8 +25,8 @@ var ( ) func (tec *TunnelEndpointCreator) StartSecretWatcher() { - chacheChan := make(chan struct{}) - started := tec.Manager.GetCache().WaitForCacheSync(chacheChan) + ctx := context.Background() + started := tec.Manager.GetCache().WaitForCacheSync(ctx) if !started { klog.Errorf("unable to sync caches") return diff --git a/internal/liqonet/tunnelEndpointCreator/serviceWatcher.go b/internal/liqonet/tunnelEndpointCreator/serviceWatcher.go index 7654f69cfd..c88fcf3985 100644 --- a/internal/liqonet/tunnelEndpointCreator/serviceWatcher.go +++ b/internal/liqonet/tunnelEndpointCreator/serviceWatcher.go @@ -28,8 +28,8 @@ var ( ) func (tec *TunnelEndpointCreator) StartServiceWatcher() { - chacheChan := make(chan struct{}) - started := tec.Manager.GetCache().WaitForCacheSync(chacheChan) + ctx := context.Background() + started := tec.Manager.GetCache().WaitForCacheSync(ctx) if !started { klog.Errorf("unable to sync caches") return diff --git a/internal/liqonet/tunnelEndpointCreator/tunnelEndpointCreator-operator.go b/internal/liqonet/tunnelEndpointCreator/tunnelEndpointCreator-operator.go index dd8a3985c2..017f393dbb 100644 --- a/internal/liqonet/tunnelEndpointCreator/tunnelEndpointCreator-operator.go +++ b/internal/liqonet/tunnelEndpointCreator/tunnelEndpointCreator-operator.go @@ -214,9 +214,9 @@ func (tec *TunnelEndpointCreator) SetupWithManager(mgr ctrl.Manager) error { // SetupSignalHandlerForTunEndCreator registers for SIGTERM, SIGINT, SIGKILL. A stop channel is returned // which is closed on one of these signals. -func (tec *TunnelEndpointCreator) SetupSignalHandlerForTunEndCreator() (stopCh <-chan struct{}) { +func (tec *TunnelEndpointCreator) SetupSignalHandlerForTunEndCreator() context.Context { klog.Infof("starting signal handler for tunnelEndpointCreator-operator") - stop := make(chan struct{}) + ctx, done := context.WithCancel(context.Background()) c := make(chan os.Signal, 1) signal.Notify(c, liqonet.ShutdownSignals...) go func(r *TunnelEndpointCreator) { @@ -224,9 +224,9 @@ func (tec *TunnelEndpointCreator) SetupSignalHandlerForTunEndCreator() (stopCh < klog.Infof("received signal: %s", sig.String()) // closing shared informers close(r.ForeignClusterStopWatcher) - close(stop) + done() }(tec) - return stop + return ctx } // Watcher for resources. diff --git a/pkg/liqo-controller-manager/namespace-controller/manage_namespace_labels.go b/pkg/liqo-controller-manager/namespace-controller/manage_namespace_labels.go index a1534f4f3c..2ada94adb7 100644 --- a/pkg/liqo-controller-manager/namespace-controller/manage_namespace_labels.go +++ b/pkg/liqo-controller-manager/namespace-controller/manage_namespace_labels.go @@ -62,7 +62,7 @@ func manageLabelPredicate() predicate.Predicate { return predicate.Funcs{ UpdateFunc: func(e event.UpdateEvent) bool { // if a namespace with namespaceControllerFinalizer is deleted, trigger Reconcile - if !(e.MetaNew.GetDeletionTimestamp().IsZero()) && slice.ContainsString(e.MetaNew.GetFinalizers(), + if !(e.ObjectNew.GetDeletionTimestamp().IsZero()) && slice.ContainsString(e.ObjectNew.GetFinalizers(), namespaceControllerFinalizer, nil) { return true } @@ -72,13 +72,13 @@ func manageLabelPredicate() predicate.Predicate { // || // if mappingLabel value is changed while the namespace is offloaded, controller has to force mappingLabel // to its old value (see addDesiredMapping function) - return ((len(e.MetaOld.GetLabels()) != len(e.MetaNew.GetLabels())) && - (mappingLabelPresence(e.MetaOld.GetLabels()) || - mappingLabelPresence(e.MetaNew.GetLabels()))) || - mappingLabelUpdate(e.MetaOld.GetLabels(), e.MetaNew.GetLabels()) + return ((len(e.ObjectOld.GetLabels()) != len(e.ObjectNew.GetLabels())) && + (mappingLabelPresence(e.ObjectOld.GetLabels()) || + mappingLabelPresence(e.ObjectNew.GetLabels()))) || + mappingLabelUpdate(e.ObjectOld.GetLabels(), e.ObjectNew.GetLabels()) }, CreateFunc: func(e event.CreateEvent) bool { - return mappingLabelPresence(e.Meta.GetLabels()) + return mappingLabelPresence(e.Object.GetLabels()) }, DeleteFunc: func(e event.DeleteEvent) bool { return false diff --git a/pkg/liqo-controller-manager/namespace-controller/namespace_controller.go b/pkg/liqo-controller-manager/namespace-controller/namespace_controller.go index c584b55335..5fbd22e810 100644 --- a/pkg/liqo-controller-manager/namespace-controller/namespace_controller.go +++ b/pkg/liqo-controller-manager/namespace-controller/namespace_controller.go @@ -42,7 +42,7 @@ const ( ) // Reconcile checks presence of right labels on the Namespace. -func (r *NamespaceReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) { +func (r *NamespaceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { namespace := &corev1.Namespace{} if err := r.Get(context.TODO(), req.NamespacedName, namespace); err != nil { klog.Errorf("%s --> Unable to get namespace '%s'", err, req.Name) diff --git a/pkg/liqo-controller-manager/namespaceMap-controller/namespaceMap_controller.go b/pkg/liqo-controller-manager/namespaceMap-controller/namespaceMap_controller.go index 4e504062fe..43b269b297 100644 --- a/pkg/liqo-controller-manager/namespaceMap-controller/namespaceMap_controller.go +++ b/pkg/liqo-controller-manager/namespaceMap-controller/namespaceMap_controller.go @@ -46,7 +46,7 @@ const ( // Reconcile adds/removes NamespaceMap finalizer, and checks differences // between DesiredMapping and CurrentMapping. -func (r *NamespaceMapReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) { +func (r *NamespaceMapReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { namespaceMap := &mapsv1alpha1.NamespaceMap{} if err := r.Get(context.TODO(), req.NamespacedName, namespaceMap); err != nil { klog.Errorf("%s --> Unable to get NamespaceMap '%s'", err, req.Name) diff --git a/pkg/liqo-controller-manager/virtualNode-controller/node_controller.go b/pkg/liqo-controller-manager/virtualNode-controller/node_controller.go index e167f2b49b..c030e24771 100644 --- a/pkg/liqo-controller-manager/virtualNode-controller/node_controller.go +++ b/pkg/liqo-controller-manager/virtualNode-controller/node_controller.go @@ -47,7 +47,7 @@ type VirtualNodeReconciler struct { // +kubebuilder:rbac:groups=core,resources=nodes/status,verbs=get;update;patch // Reconcile checks if virtual-node must be deleted or manages its NamespaceMap. -func (r *VirtualNodeReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) { +func (r *VirtualNodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { node := &corev1.Node{} if err := r.Get(context.TODO(), req.NamespacedName, node); err != nil { klog.Errorf(" %s --> Unable to get virtual-node '%s'", err, req.Name) @@ -106,18 +106,18 @@ func filterVirtualNodes() predicate.Predicate { UpdateFunc: func(e event.UpdateEvent) bool { // if the resource has no namespace, it surely a node, so we have to check if it is virtual or not, we are // interested only in virtual-nodes' deletion, not common nodes' deletion. - if e.MetaNew.GetNamespace() == "" { - if value, ok := (e.MetaNew.GetLabels())[liqoconst.TypeLabel]; !ok || value != liqoconst.TypeNode { + if e.ObjectNew.GetNamespace() == "" { + if value, ok := (e.ObjectNew.GetLabels())[liqoconst.TypeLabel]; !ok || value != liqoconst.TypeNode { return false } } // so here we monitor only NamespaceMaps' and virtual-nodes' deletion - return !(e.MetaNew.GetDeletionTimestamp().IsZero()) + return !(e.ObjectNew.GetDeletionTimestamp().IsZero()) }, CreateFunc: func(e event.CreateEvent) bool { // listen only virtual-node creation, not simple node - if e.Meta.GetNamespace() == "" { - if value, ok := (e.Meta.GetLabels())[liqoconst.TypeLabel]; !ok || value != liqoconst.TypeNode { + if e.Object.GetNamespace() == "" { + if value, ok := (e.Object.GetLabels())[liqoconst.TypeLabel]; !ok || value != liqoconst.TypeNode { return false } } @@ -128,12 +128,12 @@ func filterVirtualNodes() predicate.Predicate { return false }, GenericFunc: func(e event.GenericEvent) bool { - if e.Meta.GetNamespace() == "" { - if value, ok := (e.Meta.GetLabels())[liqoconst.TypeLabel]; !ok || value != liqoconst.TypeNode { + if e.Object.GetNamespace() == "" { + if value, ok := (e.Object.GetLabels())[liqoconst.TypeLabel]; !ok || value != liqoconst.TypeNode { return false } } - return !(e.Meta.GetDeletionTimestamp().IsZero()) + return !(e.Object.GetDeletionTimestamp().IsZero()) }, } } diff --git a/pkg/virtualKubelet/node/module/api/exec.go b/pkg/virtualKubelet/node/module/api/exec.go index 1dd6ef6137..e0c98ea122 100644 --- a/pkg/virtualKubelet/node/module/api/exec.go +++ b/pkg/virtualKubelet/node/module/api/exec.go @@ -24,7 +24,7 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/types" - remoteutils "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" + remotecommandclient "k8s.io/client-go/tools/remotecommand" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" @@ -165,7 +165,7 @@ type containerExecContext struct { // ExecInContainer Implements remotecommand.Executor // This is called by remotecommand.ServeExec. -func (c *containerExecContext) ExecInContainer(name string, uid types.UID, container string, cmd []string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remoteutils.TerminalSize, timeout time.Duration) error { +func (c *containerExecContext) ExecInContainer(name string, uid types.UID, container string, cmd []string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommandclient.TerminalSize, timeout time.Duration) error { eio := &execIO{ tty: tty, stdin: in, @@ -182,7 +182,7 @@ func (c *containerExecContext) ExecInContainer(name string, uid types.UID, conta if tty { go func() { - send := func(s remoteutils.TerminalSize) bool { + send := func(s remotecommandclient.TerminalSize) bool { select { case eio.chResize <- TermSize{Width: s.Width, Height: s.Height}: return false diff --git a/pkg/virtualKubelet/provider/pods.go b/pkg/virtualKubelet/provider/pods.go index e047ed1673..835c4d2e90 100644 --- a/pkg/virtualKubelet/provider/pods.go +++ b/pkg/virtualKubelet/provider/pods.go @@ -14,7 +14,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" + remotecommandclient "k8s.io/client-go/tools/remotecommand" "k8s.io/klog" stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1" @@ -244,12 +244,12 @@ func (p *LiqoProvider) RunInContainer(_ context.Context, homeNamespace string, h TTY: true, }, scheme.ParameterCodec) - exec, err := remotecommand.NewSPDYExecutor(p.restConfig, "POST", req.URL()) + exec, err := remotecommandclient.NewSPDYExecutor(p.restConfig, "POST", req.URL()) if err != nil { return fmt.Errorf("could not make remote command: %v", err) } - err = exec.Stream(remotecommand.StreamOptions{ + err = exec.Stream(remotecommandclient.StreamOptions{ Stdin: attach.Stdin(), Stdout: attach.Stdout(), Stderr: attach.Stderr(), diff --git a/test/e2e/util/util.go b/test/e2e/util/util.go index ed4ed5a669..48321a68ab 100644 --- a/test/e2e/util/util.go +++ b/test/e2e/util/util.go @@ -19,10 +19,9 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" + remotecommandclient "k8s.io/client-go/tools/remotecommand" "k8s.io/klog" "k8s.io/kubernetes/pkg/api/v1/pod" - api "k8s.io/kubernetes/pkg/apis/core" "github.com/liqotech/liqo/pkg/virtualKubelet" ) @@ -138,7 +137,7 @@ func PodWatcher(location string, client *kubernetes.Clientset, clusterID, namesp // Hence, we do not know the exact foreign pod name. if location == "home" { watcher, err = client.CoreV1().Pods(namespace).Watch(context.TODO(), metav1.ListOptions{ - FieldSelector: fields.OneTermEqualSelector(api.ObjectNameField, podName).String(), + FieldSelector: fields.OneTermEqualSelector(metav1.ObjectNameField, podName).String(), }) } else { watcher, err = client.CoreV1().Pods(namespace).Watch(context.TODO(), metav1.ListOptions{ @@ -212,11 +211,11 @@ func ExecCmd(config *rest.Config, client *kubernetes.Clientset, podName, namespa }, scheme.ParameterCodec) var stdout, stderr bytes.Buffer - exec, err := remotecommand.NewSPDYExecutor(config, "POST", req.URL()) + exec, err := remotecommandclient.NewSPDYExecutor(config, "POST", req.URL()) if err != nil { return "", "", err } - err = exec.Stream(remotecommand.StreamOptions{ + err = exec.Stream(remotecommandclient.StreamOptions{ Stdin: nil, Stdout: &stdout, Stderr: &stderr, diff --git a/test/unit/advertisement-operator/config-watcher_test.go b/test/unit/advertisement-operator/config-watcher_test.go index 421bce8f2c..e238610114 100644 --- a/test/unit/advertisement-operator/config-watcher_test.go +++ b/test/unit/advertisement-operator/config-watcher_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" k8serrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/watch" "k8s.io/klog" - api "k8s.io/kubernetes/pkg/apis/core" "sigs.k8s.io/controller-runtime/pkg/client" configv1alpha1 "github.com/liqotech/liqo/apis/config/v1alpha1" @@ -168,7 +168,7 @@ func testDisableBroadcaster(t *testing.T) { func waitEvent(client *crdclient.CRDClient, resourcetype string, name string) error { var timeout int64 = 10 watcher, err := client.Resource(resourcetype).Watch(&v1.ListOptions{ - FieldSelector: fields.OneTermEqualSelector(api.ObjectNameField, name).String(), + FieldSelector: fields.OneTermEqualSelector(metav1.ObjectNameField, name).String(), TimeoutSeconds: &timeout, }) if err != nil { diff --git a/test/unit/advertisement-operator/creation_test.go b/test/unit/advertisement-operator/creation_test.go index b3f277adf4..8e3b906efa 100644 --- a/test/unit/advertisement-operator/creation_test.go +++ b/test/unit/advertisement-operator/creation_test.go @@ -1,6 +1,7 @@ package advertisement_operator import ( + "context" "path/filepath" "testing" "time" @@ -85,14 +86,14 @@ func createFakeKubebuilderClient() (client.Client, record.EventRecorder) { panic(err) } - cacheStarted := make(chan struct{}) + ctx := context.TODO() go func() { - if err = manager.Start(cacheStarted); err != nil { + if err = manager.Start(ctx); err != nil { klog.Error(err) panic(err) } }() - manager.GetCache().WaitForCacheSync(cacheStarted) + manager.GetCache().WaitForCacheSync(ctx) return manager.GetClient(), manager.GetEventRecorderFor("AdvertisementOperator") } diff --git a/test/unit/crdReplicator/env_test.go b/test/unit/crdReplicator/env_test.go index 97682e8e1f..55667652d5 100644 --- a/test/unit/crdReplicator/env_test.go +++ b/test/unit/crdReplicator/env_test.go @@ -55,14 +55,14 @@ func startDispatcherOperator() { klog.Error(err) os.Exit(-1) } - cacheStartedLocal := make(chan struct{}) + ctx := context.TODO() go func() { if err = k8sManagerLocal.Start(ctrl.SetupSignalHandler()); err != nil { klog.Error(err) panic(err) } }() - started := k8sManagerLocal.GetCache().WaitForCacheSync(cacheStartedLocal) + started := k8sManagerLocal.GetCache().WaitForCacheSync(ctx) if !started { klog.Errorf("an error occurred while waiting for the chache to start") os.Exit(-1)