Merge pull request #1741 from doublek/prep-3.11.2

Prep 3.11.2

Makefile

@@ -532,20 +532,20 @@ define fetch_crds
 endef
 define copy_crds
     $(eval dir := $(1))
-	@cp .crds/$(dir)/config/crd/* pkg/crds/$(dir)/ && echo "Copied $(dir) CRDs"
+	@cp .crds/$(dir)/libcalico-go/config/crd/* pkg/crds/$(dir)/ && echo "Copied $(dir) CRDs"
 endef
 
 .PHONY: read-libcalico-version read-libcalico-enterprise-version
 .PHONY: update-calico-crds update-enterprise-crds
 .PHONY: fetch-calico-crds fetch-enterprise-crds
 .PHONY: prepare-for-calico-crds prepare-for-enterprise-crds
 
-LIBCALICO?=projectcalico/libcalico-go
+CALICO?=projectcalico/calico
 read-libcalico-calico-version:
-	$(eval LIBCALICO_BRANCH := $(shell $(CONTAINERIZED) $(CALICO_BUILD) \
+	$(eval CALICO_BRANCH := $(shell $(CONTAINERIZED) $(CALICO_BUILD) \
 	bash -c '$(GIT_CONFIG_SSH) \
 	yq r config/calico_versions.yml components.libcalico-go.version'))
-	if [ -z "$(LIBCALICO_BRANCH)" ]; then echo "libcalico branch not defined"; exit 1; fi
+	if [ -z "$(CALICO_BRANCH)" ]; then echo "libcalico branch not defined"; exit 1; fi
 
 update-calico-crds: fetch-calico-crds
 	$(call copy_crds,"calico")
@@ -554,14 +554,14 @@ prepare-for-calico-crds:
 	$(call prep_local_crds,"calico")
 
 fetch-calico-crds: prepare-for-calico-crds read-libcalico-calico-version
-	$(call fetch_crds,$(LIBCALICO),$(LIBCALICO_BRANCH),"calico")
+	$(call fetch_crds,$(CALICO),$(CALICO_BRANCH),"calico")
 
-LIBCALICO_ENTERPRISE?=tigera/libcalico-go-private
+CALICO_ENTERPRISE?=tigera/calico-private
 read-libcalico-enterprise-version:
-	$(eval LIBCALICO_ENTERPRISE_BRANCH := $(shell $(CONTAINERIZED) $(CALICO_BUILD) \
+	$(eval CALICO_ENTERPRISE_BRANCH := $(shell $(CONTAINERIZED) $(CALICO_BUILD) \
 	bash -c '$(GIT_CONFIG_SSH) \
 	yq r config/enterprise_versions.yml components.libcalico-go.version'))
-	if [ -z "$(LIBCALICO_ENTERPRISE_BRANCH)" ]; then echo "libcalico enterprise branch not defined"; exit 1; fi
+	if [ -z "$(CALICO_ENTERPRISE_BRANCH)" ]; then echo "libcalico enterprise branch not defined"; exit 1; fi
 
 update-enterprise-crds: fetch-enterprise-crds
 	$(call copy_crds,"enterprise")
@@ -570,7 +570,7 @@ prepare-for-enterprise-crds:
 	$(call prep_local_crds,"enterprise")
 
 fetch-enterprise-crds: prepare-for-enterprise-crds  read-libcalico-enterprise-version
-	$(call fetch_crds,$(LIBCALICO_ENTERPRISE),$(LIBCALICO_ENTERPRISE_BRANCH),"enterprise")
+	$(call fetch_crds,$(CALICO_ENTERPRISE),$(CALICO_ENTERPRISE_BRANCH),"enterprise")
 
 .PHONY: prepull-image
 prepull-image:

config/calico_versions.yml

@@ -1,18 +1,18 @@
-title: v3.21.0
+title: v3.21.4
 components:
   libcalico-go:
-    version: v3.21.0
+    version: v3.21.4
   typha:
-    version: v3.21.0
+    version: v3.21.4
   calico/node:
-    version: v3.21.0
+    version: v3.21.4
   calico/cni:
-    version: v3.21.0
+    version: v3.21.4
   calico/kube-controllers:
-    version: v3.21.0
+    version: v3.21.4
   flexvol:
-    version: v3.21.0
+    version: v3.21.4
   calico/apiserver:
-    version: v3.21.0
+    version: v3.21.4
   calico/windows-upgrade:
-    version: v3.21.0
+    version: v3.21.4

config/common_versions.yml

@@ -1,5 +1,5 @@
-title: v1.1.0
+title: v1.1.1
 components:
   key-cert-provisioner:
     image: tigera/key-cert-provisioner
-    version: v1.1.0
+    version: v1.1.1

config/enterprise_versions.yml

@@ -1,125 +1,125 @@
-title: v3.11.1
+title: v3.11.2
 components:
   libcalico-go:
-    version: v3.11.1
+    version: v3.11.2
   cnx-manager:
     image: tigera/cnx-manager
-    version: v3.11.1
+    version: v3.11.2
   voltron:
     image: tigera/voltron
-    version: v3.11.1
+    version: v3.11.2
   cnx-apiserver:
     image: tigera/cnx-apiserver
-    version: v3.11.1
+    version: v3.11.2
   cnx-queryserver:
     image: tigera/cnx-queryserver
-    version: v3.11.1
+    version: v3.11.2
   cnx-kube-controllers:
     image: tigera/kube-controllers
-    version: v3.11.1
+    version: v3.11.2
   typha:
     image: tigera/typha
-    version: v3.11.1
+    version: v3.11.2
   cnx-node:
     image: tigera/cnx-node
-    version: v3.11.1
+    version: v3.11.2
   fluentd:
     image: tigera/fluentd
-    version: v3.11.1
+    version: v3.11.2
   fluentd-windows:
     image: tigera/fluentd-windows
-    version: v3.11.1
+    version: v3.11.2
   es-proxy:
     image: tigera/es-proxy
-    version: v3.11.1
+    version: v3.11.2
   es-gateway:
     image: tigera/es-gateway
-    version: v3.11.1
+    version: v3.11.2
   dex:
     image: tigera/dex
-    version: v3.11.1
+    version: v3.11.2
   eck-kibana:
     version: 7.16.2
   kibana:
     image: tigera/kibana
-    version: v3.11.1
+    version: v3.11.2
   eck-elasticsearch:
     version: 7.16.2
   elasticsearch:
     image: tigera/elasticsearch
-    version: v3.11.1
+    version: v3.11.2
   elastic-tsee-installer:
     image: tigera/intrusion-detection-job-installer
-    version: v3.11.1
+    version: v3.11.2
   es-curator:
     image: tigera/es-curator
-    version: v3.11.1
+    version: v3.11.2
   intrusion-detection-controller:
     image: tigera/intrusion-detection-controller
-    version: v3.11.1
+    version: v3.11.2
   compliance-controller:
     image: tigera/compliance-controller
-    version: v3.11.1
+    version: v3.11.2
   compliance-reporter:
     image: tigera/compliance-reporter
-    version: v3.11.1
+    version: v3.11.2
   compliance-snapshotter:
     image: tigera/compliance-snapshotter
-    version: v3.11.1
+    version: v3.11.2
   compliance-server:
     image: tigera/compliance-server
-    version: v3.11.1
+    version: v3.11.2
   compliance-benchmarker:
     image: tigera/compliance-benchmarker
-    version: v3.11.1
+    version: v3.11.2
   guardian:
     image: tigera/guardian
-    version: v3.11.1
+    version: v3.11.2
   tigera-cni:
     image: tigera/cni
-    version: v3.11.1
+    version: v3.11.2
   cloud-controllers:
     image: tigera/cloud-controllers
-    version: v3.11.1
+    version: v3.11.2
   elasticsearch-metrics:
     image: tigera/elasticsearch-metrics
-    version: v3.11.1
+    version: v3.11.2
   packetcapture-api:
     image: tigera/packetcapture-api
-    version: v3.11.1
+    version: v3.11.2
   # coreos-prometheus holds the version of prometheus built for tigera/prometheus,
   # which prometheus operator uses to validate.
   coreos-prometheus:
     version: v2.32.0
   prometheus:
     image: tigera/prometheus
-    version: release-calient-v3.11
+    version: v3.11.2
   # coreos-prometheus holds the version of alertmanager built for tigera/alertmanager,
   # which prometheus operator uses to validate.
   coreos-alertmanager:
     version: v0.23.0
   alertmanager:
     image: tigera/alertmanager
-    version: release-calient-v3.11
+    version: v3.11.2
   tigera-prometheus-service:
     image: tigera/prometheus-service
-    version: v3.11.1
+    version: v3.11.2
   deep-packet-inspection:
     image: tigera/deep-packet-inspection
-    version: v3.11.1
+    version: v3.11.2
   windows:
     image: tigera/calico-windows-upgrade
-    version: v3.11.1
+    version: v3.11.2
   # The components below are third-party images that have been retagged under
   # quay.io/tigera so all enterprise images come from the same repository and org.
   elasticsearch-operator:
     image: tigera/eck-operator
-    version: release-calient-v3.11
+    version: v3.11.2
   eck-elasticsearch-operator:
     version: 1.8.0
   l7-collector:
     image: tigera/l7-collector
-    version: v3.11.1
+    version: v3.11.2
   envoy:
     image: tigera/envoy
-    version: v3.11.1
+    version: v3.11.2

pkg/components/calico.go

@@ -17,40 +17,40 @@ package components
 import "github.com/tigera/operator/version"
 
 var (
-	CalicoRelease string = "v3.21.0"
+	CalicoRelease string = "v3.21.4"
 
 	ComponentCalicoCNI = component{
-		Version: "v3.21.0",
+		Version: "v3.21.4",
 		Image:   "calico/cni",
 	}
 
 	ComponentCalicoKubeControllers = component{
-		Version: "v3.21.0",
+		Version: "v3.21.4",
 		Image:   "calico/kube-controllers",
 	}
 
 	ComponentCalicoNode = component{
-		Version: "v3.21.0",
+		Version: "v3.21.4",
 		Image:   "calico/node",
 	}
 
 	ComponentCalicoTypha = component{
-		Version: "v3.21.0",
+		Version: "v3.21.4",
 		Image:   "calico/typha",
 	}
 
 	ComponentFlexVolume = component{
-		Version: "v3.21.0",
+		Version: "v3.21.4",
 		Image:   "calico/pod2daemon-flexvol",
 	}
 
 	ComponentCalicoAPIServer = component{
-		Version: "v3.21.0",
+		Version: "v3.21.4",
 		Image:   "calico/apiserver",
 	}
 
 	ComponentWindows = component{
-		Version: "v3.21.0",
+		Version: "v3.21.4",
 		Image:   "calico/windows-upgrade",
 	}
 	ComponentOperatorInit = component{

pkg/components/common.go

@@ -16,7 +16,7 @@ package components
 
 var (
 	ComponentCSRInitContainer = component{
-		Version: "v1.1.0",
+		Version: "v1.1.1",
 		Image:   "tigera/key-cert-provisioner",
 	}
 	CommonComponents = []component{