Merge pull request #2395 from mgleung/update-for-v3.25.0

Update to Calico v3.25.0

config/calico_versions.yml

@@ -1,23 +1,23 @@
 # Components defined here are required to be kept in sync with hack/gen-versions/calico.go.tpl
-title: master
+title: v3.25.0
 components:
   libcalico-go:
-    version: master
+    version: v3.25.0
   typha:
-    version: master
+    version: v3.25.0
   calico/node:
-    version: master
+    version: v3.25.0
   calico/cni:
-    version: master
+    version: v3.25.0
   calico/kube-controllers:
-    version: master
+    version: v3.25.0
   flexvol:
-    version: master
+    version: v3.25.0
   calico/apiserver:
-    version: master
+    version: v3.25.0
   calico/windows-upgrade:
-    version: master
+    version: v3.25.0
   calico/csi:
-    version: master
+    version: v3.25.0
   csi-node-driver-registrar:
-    version: master
+    version: v3.25.0

config/common_versions.yml

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

config/enterprise_versions.yml

@@ -1,135 +1,135 @@
 # Components defined here are required to be kept in sync with hack/gen-versions/enterprise.go.tpl
-title: master
+title: v3.15.0
 components:
   libcalico-go:
-    version: master
+    version: v3.15.0
   cnx-manager:
     image: tigera/cnx-manager
-    version: master
+    version: v3.15.0
   voltron:
     image: tigera/voltron
-    version: master
+    version: v3.15.0
   cnx-apiserver:
     image: tigera/cnx-apiserver
-    version: master
+    version: v3.15.0
   cnx-queryserver:
     image: tigera/cnx-queryserver
-    version: master
+    version: v3.15.0
   cnx-kube-controllers:
     image: tigera/kube-controllers
-    version: master
+    version: v3.15.0
   typha:
     image: tigera/typha
-    version: master
+    version: v3.15.0
   cnx-node:
     image: tigera/cnx-node
-    version: master
+    version: v3.15.0
   fluentd:
     image: tigera/fluentd
-    version: master
+    version: v3.15.0
   fluentd-windows:
     image: tigera/fluentd-windows
-    version: master
+    version: v3.15.0
   es-proxy:
     image: tigera/es-proxy
-    version: master
+    version: v3.15.0
   es-gateway:
     image: tigera/es-gateway
-    version: master
+    version: v3.15.0
   dex:
     image: tigera/dex
-    version: master
+    version: v3.15.0
   eck-kibana:
     version: 7.17.7
   kibana:
     image: tigera/kibana
-    version: master
+    version: v3.15.0
   eck-elasticsearch:
     version: 7.17.7
   elasticsearch:
     image: tigera/elasticsearch
-    version: master
+    version: v3.15.0
   elastic-tsee-installer:
     image: tigera/intrusion-detection-job-installer
-    version: master
+    version: v3.15.0
   es-curator:
     image: tigera/es-curator
-    version: master
+    version: v3.15.0
   intrusion-detection-controller:
     image: tigera/intrusion-detection-controller
-    version: master
+    version: v3.15.0
   anomaly_detection_jobs:
     image: tigera/anomaly_detection_jobs
-    version: master
+    version: v3.15.0
   anomaly-detection-api:
     image: tigera/anomaly-detection-api
-    version: master
+    version: v3.15.0
   compliance-controller:
     image: tigera/compliance-controller
-    version: master
+    version: v3.15.0
   compliance-reporter:
     image: tigera/compliance-reporter
-    version: master
+    version: v3.15.0
   compliance-snapshotter:
     image: tigera/compliance-snapshotter
-    version: master
+    version: v3.15.0
   compliance-server:
     image: tigera/compliance-server
-    version: master
+    version: v3.15.0
   compliance-benchmarker:
     image: tigera/compliance-benchmarker
-    version: master
+    version: v3.15.0
   guardian:
     image: tigera/guardian
-    version: master
+    version: v3.15.0
   tigera-cni:
     image: tigera/cni
-    version: master
+    version: v3.15.0
   cloud-controllers:
     image: tigera/cloud-controllers
-    version: master
+    version: v3.15.0
   elasticsearch-metrics:
     image: tigera/elasticsearch-metrics
-    version: master
+    version: v3.15.0
   packetcapture:
     image: tigera/packetcapture
-    version: master
+    version: v3.15.0
   # 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: master
+    version: v3.15.0
   # 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: master
+    version: v3.15.0
   tigera-prometheus-service:
     image: tigera/prometheus-service
-    version: master
+    version: v3.15.0
   deep-packet-inspection:
     image: tigera/deep-packet-inspection
-    version: master
+    version: v3.15.0
   windows-upgrade:
     image: tigera/calico-windows-upgrade
-    version: master
+    version: v3.15.0
   # 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: master
+    version: v3.15.0
   eck-elasticsearch-operator:
     version: 2.5.0
   l7-collector:
     image: tigera/l7-collector
-    version: master
+    version: v3.15.0
   envoy:
     image: tigera/envoy
-    version: master
+    version: v3.15.0
   dikastes:
     image: tigera/dikastes
-    version: master
+    version: v3.15.0

pkg/components/calico.go

@@ -20,55 +20,55 @@ package components
 import "github.com/tigera/operator/version"
 
 var (
-	CalicoRelease string = "master"
+	CalicoRelease string = "v3.25.0"
 
 	ComponentCalicoCNI = component{
-		Version: "master",
+		Version: "v3.25.0",
 		Image:   "calico/cni",
 	}
 
 	ComponentCalicoCNIFIPS = component{
-		Version: "master-fips",
+		Version: "v3.25.0-fips",
 		Image:   "calico/cni",
 	}
 
 	ComponentCalicoKubeControllers = component{
-		Version: "master",
+		Version: "v3.25.0",
 		Image:   "calico/kube-controllers",
 	}
 
 	ComponentCalicoNode = component{
-		Version: "master",
+		Version: "v3.25.0",
 		Image:   "calico/node",
 	}
 
 	ComponentCalicoTypha = component{
-		Version: "master",
+		Version: "v3.25.0",
 		Image:   "calico/typha",
 	}
 
 	ComponentFlexVolume = component{
-		Version: "master",
+		Version: "v3.25.0",
 		Image:   "calico/pod2daemon-flexvol",
 	}
 
 	ComponentCalicoAPIServer = component{
-		Version: "master",
+		Version: "v3.25.0",
 		Image:   "calico/apiserver",
 	}
 
 	ComponentWindowsUpgrade = component{
-		Version: "master",
+		Version: "v3.25.0",
 		Image:   "calico/windows-upgrade",
 	}
 
 	ComponentCalicoCSI = component{
-		Version: "master",
+		Version: "v3.25.0",
 		Image:   "calico/csi",
 	}
 
 	ComponentCalicoCSIRegistrar = component{
-		Version: "master",
+		Version: "v3.25.0",
 		Image:   "calico/node-driver-registrar",
 	}
 	ComponentOperatorInit = component{

pkg/components/common.go

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