go.mod, vendor: update cilium to 1.11.0

This also pulls in k8s 1.23 (tagged as v0.24.0-alpha.0, see cilium#18008 (comment)) and thus requires some changes to corev1.Probe and corev1.Lifecycle instantiations. Signed-off-by: Tobias Klauser <tobias@cilium.io>
michi-covalent · Dec 7, 2021 · ef10ae0 · ef10ae0
1 parent 1220211
commit ef10ae0
Show file tree

Hide file tree

Showing 471 changed files with 54,981 additions and 11,844 deletions.
diff --git a/cli/connectivity/check/deployment.go b/cli/connectivity/check/deployment.go
@@ -128,7 +128,7 @@ func newService(name string, selector map[string]string, labels map[string]strin
 
 func newLocalReadinessProbe(port int, path string) *corev1.Probe {
 	return &corev1.Probe{
-		Handler: corev1.Handler{
+		ProbeHandler: corev1.ProbeHandler{
 			HTTPGet: &corev1.HTTPGetAction{
 				Path:   path,
 				Port:   intstr.FromInt(port),

diff --git a/cli/go.mod b/cli/go.mod
@@ -12,7 +12,7 @@ replace (
 
 require (
 	github.com/blang/semver/v4 v4.0.0
-	github.com/cilium/cilium v1.11.0-rc3
+	github.com/cilium/cilium v1.11.0
 	github.com/cilium/hubble v0.9.0
 	github.com/cilium/workerpool v1.1.1
 	github.com/cloudflare/cfssl v1.6.1
@@ -23,10 +23,10 @@ require (
 	github.com/spf13/cobra v1.2.1
 	google.golang.org/grpc v1.42.0
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
-	k8s.io/api v0.22.3
-	k8s.io/apimachinery v0.22.3
-	k8s.io/cli-runtime v0.22.3
-	k8s.io/client-go v0.22.3
+	k8s.io/api v0.24.0-alpha.0
+	k8s.io/apimachinery v0.24.0-alpha.0
+	k8s.io/cli-runtime v0.24.0-alpha.0
+	k8s.io/client-go v0.24.0-alpha.0
 	k8s.io/klog/v2 v2.30.0
 )
 
@@ -203,10 +203,11 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/kube-openapi v0.0.0-20211029090450-ec1f4c89925a // indirect
+	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
 	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
-	sigs.k8s.io/kustomize/api v0.8.11 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.11.0 // indirect
+	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
+	sigs.k8s.io/kustomize/api v0.10.1 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.13.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
diff --git a/cli/go.sum b/cli/go.sum
diff --git a/cli/hubble/relay.go b/cli/hubble/relay.go
@@ -127,14 +127,14 @@ func (k *K8sHubble) generateRelayDeployment() *appsv1.Deployment {
 								},
 							},
 							ReadinessProbe: &corev1.Probe{
-								Handler: corev1.Handler{
+								ProbeHandler: corev1.ProbeHandler{
 									TCPSocket: &corev1.TCPSocketAction{
 										Port: relayPortIntstr,
 									},
 								},
 							},
 							LivenessProbe: &corev1.Probe{
-								Handler: corev1.Handler{
+								ProbeHandler: corev1.ProbeHandler{
 									TCPSocket: &corev1.TCPSocketAction{
 										Port: relayPortIntstr,
 									},

diff --git a/cli/install/install.go b/cli/install/install.go
@@ -264,7 +264,7 @@ func (k *K8sInstaller) generateAgentDaemonSet() *appsv1.DaemonSet {
 							Image:           k.fqAgentImage(),
 							ImagePullPolicy: corev1.PullIfNotPresent,
 							LivenessProbe: &corev1.Probe{
-								Handler: corev1.Handler{
+								ProbeHandler: corev1.ProbeHandler{
 									HTTPGet: &corev1.HTTPGetAction{
 										Host:   "127.0.0.1",
 										Path:   "/healthz",
@@ -285,7 +285,7 @@ func (k *K8sInstaller) generateAgentDaemonSet() *appsv1.DaemonSet {
 								FailureThreshold:    int32(10),
 							},
 							ReadinessProbe: &corev1.Probe{
-								Handler: corev1.Handler{
+								ProbeHandler: corev1.ProbeHandler{
 									HTTPGet: &corev1.HTTPGetAction{
 										Host:   "127.0.0.1",
 										Path:   "/healthz",
@@ -378,12 +378,12 @@ func (k *K8sInstaller) generateAgentDaemonSet() *appsv1.DaemonSet {
 								},
 							},
 							Lifecycle: &corev1.Lifecycle{
-								PostStart: &corev1.Handler{
+								PostStart: &corev1.LifecycleHandler{
 									Exec: &corev1.ExecAction{
 										Command: []string{"/cni-install.sh", "--enable-debug=false"},
 									},
 								},
-								PreStop: &corev1.Handler{
+								PreStop: &corev1.LifecycleHandler{
 									Exec: &corev1.ExecAction{
 										Command: []string{"/cni-uninstall.sh"},
 									},

diff --git a/cli/vendor/github.com/cilium/cilium/AUTHORS b/cli/vendor/github.com/cilium/cilium/AUTHORS
diff --git a/cli/vendor/github.com/cilium/cilium/api/v1/models/kube_proxy_replacement.go b/cli/vendor/github.com/cilium/cilium/api/v1/models/kube_proxy_replacement.go
diff --git a/cli/vendor/github.com/cilium/cilium/api/v1/models/zz_generated.deepcopy.go b/cli/vendor/github.com/cilium/cilium/api/v1/models/zz_generated.deepcopy.go
diff --git a/cli/vendor/github.com/cilium/cilium/pkg/client/client.go b/cli/vendor/github.com/cilium/cilium/pkg/client/client.go