Merge remote-tracking branch 'origin/master' into install-envoy-gateway

Makefile

@@ -91,7 +91,7 @@ endif
 
 PACKAGE_NAME?=github.com/tigera/operator
 LOCAL_USER_ID?=$(shell id -u $$USER)
-GO_BUILD_VER?=v0.93
+GO_BUILD_VER?=v0.94
 CALICO_BUILD?=calico/go-build:$(GO_BUILD_VER)-$(BUILDARCH)
 SRC_FILES=$(shell find ./pkg -name '*.go')
 SRC_FILES+=$(shell find ./api -name '*.go')
@@ -282,7 +282,7 @@ endif
 BINDIR?=build/init/bin
 $(BINDIR)/kubectl:
 	mkdir -p $(BINDIR)
-	curl -L https://storage.googleapis.com/kubernetes-release/release/v1.25.6/bin/linux/$(ARCH)/kubectl -o $@
+	curl -sSf -L --retry 5 https://dl.k8s.io/release/v1.30.5/bin/linux/$(ARCH)/kubectl -o $@
 	chmod +x $@
 
 kubectl: $(BINDIR)/kubectl
@@ -322,7 +322,7 @@ run-fvs: pkg/envoygateway/resources.yaml
 
 ## Create a local kind dual stack cluster.
 KIND_KUBECONFIG?=./kubeconfig.yaml
-K8S_VERSION?=v1.21.14
+KINDEST_NODE_VERSION?=v1.30.4
 cluster-create: $(BINDIR)/kubectl $(BINDIR)/kind
 	# First make sure any previous cluster is deleted
 	make cluster-destroy
@@ -331,7 +331,7 @@ cluster-create: $(BINDIR)/kubectl $(BINDIR)/kind
 	$(BINDIR)/kind create cluster \
 	        --config ./deploy/kind-config.yaml \
 	        --kubeconfig $(KIND_KUBECONFIG) \
-	        --image kindest/node:$(K8S_VERSION)
+	        --image kindest/node:$(KINDEST_NODE_VERSION)
 
 	./deploy/scripts/ipv6_kind_cluster_update.sh
 	# Deploy resources needed in test env.

api/v1/applicationlayer_types.go

@@ -58,6 +58,9 @@ type ApplicationLayerPolicyStatusType string
 // +kubebuilder:validation:Enum=Enabled;Disabled
 type SidecarStatusType string
 
+// +kubebuilder:validation:Enum=Enabled;Disabled
+type SidecarWebhookStateType string
+
 const (
 	WAFDisabled                    WAFStatusType                    = "Disabled"
 	WAFEnabled                     WAFStatusType                    = "Enabled"
@@ -67,6 +70,8 @@ const (
 	ApplicationLayerPolicyDisabled ApplicationLayerPolicyStatusType = "Disabled"
 	SidecarEnabled                 SidecarStatusType                = "Enabled"
 	SidecarDisabled                SidecarStatusType                = "Disabled"
+	SidecarWebhookStateEnabled     SidecarWebhookStateType          = "Enabled"
+	SidecarWebhookStateDisabled    SidecarWebhookStateType          = "Disabled"
 )
 
 type EnvoySettings struct {
@@ -110,6 +115,9 @@ type ApplicationLayerStatus struct {
 	// State provides user-readable status.
 	State string `json:"state,omitempty"`
 
+	// SidecarWebhook provides the state of sidecar injection mutatinwebhookconfiguration
+	SidecarWebhook *SidecarWebhookStateType `json:"sidecarWebhook,omitempty"`
+
 	// Conditions represents the latest observed set of conditions for the component. A component may be one or more of
 	// Ready, Progressing, Degraded or other customer types.
 	// +optional

api/v1/installation_types.go

@@ -468,8 +468,10 @@ type CalicoNetworkSpec struct {
 	// +kubebuilder:validation:Enum=Enabled;Disabled
 	BGP *BGPOption `json:"bgp,omitempty"`
 
-	// IPPools contains a list of IP pools to create if none exist. At most one IP pool of each
-	// address family may be specified. If omitted, a single pool will be configured if needed.
+	// IPPools contains a list of IP pools to manage. If nil, a single IPv4 IP pool
+	// will be created by the operator. If an empty list is provided, the operator will not create any IP pools and will instead
+	// wait for IP pools to be created out-of-band.
+	// IP pools in this list will be reconciled by the operator and should not be modified out-of-band.
 	// +optional
 	// +kubebuilder:validation:MaxItems=25
 	IPPools []IPPool `json:"ipPools,omitempty"`

api/v1/monitor_types.go

@@ -90,13 +90,13 @@ type Endpoint struct {
 	HonorTimestamps *bool `json:"honorTimestamps,omitempty"`
 
 	// MetricRelabelConfigs to apply to samples before ingestion.
-	MetricRelabelConfigs []*v1.RelabelConfig `json:"metricRelabelings,omitempty"`
+	MetricRelabelConfigs []v1.RelabelConfig `json:"metricRelabelings,omitempty"`
 
 	// RelabelConfigs to apply to samples before scraping.
 	// Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields.
 	// The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
 	// More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
-	RelabelConfigs []*v1.RelabelConfig `json:"relabelings,omitempty"`
+	RelabelConfigs []v1.RelabelConfig `json:"relabelings,omitempty"`
 }
 
 // MonitorStatus defines the observed state of Tigera monitor.

config/enterprise_versions.yml

@@ -46,12 +46,12 @@ components:
     image: tigera/dex
     version: master
   eck-kibana:
-    version: 7.17.22
+    version: 7.17.25
   kibana:
     image: tigera/kibana
     version: master
   eck-elasticsearch:
-    version: 7.17.22
+    version: 7.17.25
   elasticsearch:
     image: tigera/elasticsearch
     version: master