Merge pull request #1652 from doublek/prep-v3.11.0

Prep Enterprise v3.11.0

config/calico_versions.yml

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

config/enterprise_versions.yml

@@ -1,101 +1,101 @@
-title: release-calient-v3.11
+title: v3.11.0
 components:
   libcalico-go:
-    version: release-calient-v3.11
+    version: v3.11.0
   cnx-manager:
     image: tigera/cnx-manager
-    version: release-calient-v3.11
+    version: v3.11.0
   voltron:
     image: tigera/voltron
-    version: release-calient-v3.11
+    version: v3.11.0
   cnx-apiserver:
     image: tigera/cnx-apiserver
-    version: release-calient-v3.11
+    version: v3.11.0
   cnx-queryserver:
     image: tigera/cnx-queryserver
-    version: release-calient-v3.11
+    version: v3.11.0
   cnx-kube-controllers:
     image: tigera/kube-controllers
-    version: release-calient-v3.11
+    version: v3.11.0
   typha:
     image: tigera/typha
-    version: release-calient-v3.11
+    version: v3.11.0
   cnx-node:
     image: tigera/cnx-node
-    version: release-calient-v3.11
+    version: v3.11.0
   fluentd:
     image: tigera/fluentd
-    version: release-calient-v3.11
+    version: v3.11.0
   fluentd-windows:
     image: tigera/fluentd-windows
-    version: release-calient-v3.11
+    version: v3.11.0
   es-proxy:
     image: tigera/es-proxy
-    version: release-calient-v3.11
+    version: v3.11.0
   es-gateway:
     image: tigera/es-gateway
-    version: release-calient-v3.11
+    version: v3.11.0
   eck-kibana:
     version: 7.11.2
   dex:
     image: tigera/dex
-    version: release-calient-v3.11
+    version: v3.11.0
   kibana:
     image: tigera/kibana
-    version: release-calient-v3.11
+    version: v3.11.0
   eck-elasticsearch:
     version: 7.11.2
   elasticsearch:
     image: tigera/elasticsearch
-    version: release-calient-v3.11
+    version: v3.11.0
   elastic-tsee-installer:
     image: tigera/intrusion-detection-job-installer
-    version: release-calient-v3.11
+    version: v3.11.0
   es-curator:
     image: tigera/es-curator
-    version: release-calient-v3.11
+    version: v3.11.0
   intrusion-detection-controller:
     image: tigera/intrusion-detection-controller
-    version: release-calient-v3.11
+    version: v3.11.0
   compliance-controller:
     image: tigera/compliance-controller
-    version: release-calient-v3.11
+    version: v3.11.0
   compliance-reporter:
     image: tigera/compliance-reporter
-    version: release-calient-v3.11
+    version: v3.11.0
   compliance-snapshotter:
     image: tigera/compliance-snapshotter
-    version: release-calient-v3.11
+    version: v3.11.0
   compliance-server:
     image: tigera/compliance-server
-    version: release-calient-v3.11
+    version: v3.11.0
   compliance-benchmarker:
     image: tigera/compliance-benchmarker
-    version: release-calient-v3.11
+    version: v3.11.0
   guardian:
     image: tigera/guardian
-    version: release-calient-v3.11
+    version: v3.11.0
   tigera-cni:
     image: tigera/cni
-    version: release-calient-v3.11
+    version: v3.11.0
   cloud-controllers:
     image: tigera/cloud-controllers
-    version: release-calient-v3.11
+    version: v3.11.0
   elasticsearch-metrics:
     image: tigera/elasticsearch-metrics
-    version: release-calient-v3.11
+    version: v3.11.0
   packetcapture-api:
     image: tigera/packetcapture-api
-    version: release-calient-v3.11
+    version: v3.11.0
   tigera-prometheus-service:
     image: tigera/prometheus-service
-    version: release-calient-v3.11
+    version: v3.11.0
   deep-packet-inspection:
     image: tigera/deep-packet-inspection
-    version: release-calient-v3.11
+    version: v3.11.0
   windows:
     image: tigera/calico-windows-upgrade
-    version: release-calient-v3.11
+    version: v3.11.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:
@@ -109,9 +109,9 @@ components:
     version: v0.20.0
   l7-collector:
     image: tigera/l7-collector
-    version: release-calient-v3.11
+    version: v3.11.0
   envoy:
     image: tigera/envoy
-    version: release-calient-v3.11
+    version: v3.11.0
 
 

pkg/components/calico.go

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