Automatic version updates for v1.36.1 release (#3590)

* Automatic version updates for v1.36.1 release

* Update versions

* Update generated versions

config/enterprise_versions.yml

@@ -1,157 +1,156 @@
 # Components defined here are required to be kept in sync with hack/gen-versions/enterprise.go.tpl
-title: release-calient-v3.20
+title: v3.20.0-2.0
 components:
   libcalico-go:
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   cnx-manager:
     image: tigera/cnx-manager
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   voltron:
     image: tigera/voltron
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   cnx-apiserver:
     image: tigera/cnx-apiserver
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   cnx-queryserver:
     image: tigera/cnx-queryserver
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   cnx-kube-controllers:
     image: tigera/kube-controllers
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   typha:
     image: tigera/typha
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   cnx-node:
     image: tigera/cnx-node
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   cnx-node-windows:
     image: tigera/cnx-node-windows
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   fluentd:
     image: tigera/fluentd
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   fluentd-windows:
     image: tigera/fluentd-windows
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   es-proxy:
     image: tigera/es-proxy
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   linseed:
     image: tigera/linseed
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   es-gateway:
     image: tigera/es-gateway
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   dex:
     image: tigera/dex
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   eck-kibana:
     version: 7.17.25
   kibana:
     image: tigera/kibana
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   eck-elasticsearch:
     version: 7.17.25
   elasticsearch:
     image: tigera/elasticsearch
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   elastic-tsee-installer:
     image: tigera/intrusion-detection-job-installer
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   es-curator:
     image: tigera/es-curator
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   intrusion-detection-controller:
     image: tigera/intrusion-detection-controller
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   security-event-webhooks-processor:
     image: tigera/webhooks-processor
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   compliance-controller:
     image: tigera/compliance-controller
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   compliance-reporter:
     image: tigera/compliance-reporter
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   compliance-snapshotter:
     image: tigera/compliance-snapshotter
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   compliance-server:
     image: tigera/compliance-server
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   compliance-benchmarker:
     image: tigera/compliance-benchmarker
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   guardian:
     image: tigera/guardian
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   tigera-cni:
     image: tigera/cni
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   tigera-cni-windows:
     image: tigera/cni-windows
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   elasticsearch-metrics:
     image: tigera/elasticsearch-metrics
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   packetcapture:
     image: tigera/packetcapture
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   policy-recommendation:
     image: tigera/policy-recommendation
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   # coreos-prometheus holds the version of prometheus built for tigera/prometheus,
   # which prometheus operator uses to validate.
   coreos-prometheus:
     version: v2.54.1
   prometheus:
     image: tigera/prometheus
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   # coreos-prometheus holds the version of alertmanager built for tigera/alertmanager,
   # which prometheus operator uses to validate.
   coreos-alertmanager:
     version: v0.27.0
   alertmanager:
     image: tigera/alertmanager
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   tigera-prometheus-service:
     image: tigera/prometheus-service
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   deep-packet-inspection:
     image: tigera/deep-packet-inspection
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   flexvol:
     image: tigera/pod2daemon-flexvol
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   csi:
     image: tigera/csi
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   csi-node-driver-registrar:
     image: tigera/node-driver-registrar
-    version: release-calient-v3.20
+    version: v3.20.0-2.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: release-calient-v3.20
+    version: v3.20.0-2.0
   eck-elasticsearch-operator:
     version: 2.6.1
   l7-collector:
     image: tigera/l7-collector
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   envoy:
     image: tigera/envoy
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   dikastes:
     image: tigera/dikastes
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   l7-admission-controller:
     image: tigera/l7-admission-controller
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   egress-gateway:
     image: tigera/egress-gateway
-    version: release-calient-v3.20
+    version: v3.20.0-2.0
   key-cert-provisioner:
     image: tigera/key-cert-provisioner
-    version: release-calient-v3.20
-
+    version: v3.20.0-2.0

hack/gen-versions/main.go

@@ -23,7 +23,7 @@ import (
 
 const (
 	defaultCalicoRegistry     = "docker.io"
-	defaultEnterpriseRegistry = "gcr.io/unique-caldron-775/cnx"
+	defaultEnterpriseRegistry = "quay.io"
 
 	eeVersionsTpl     = "enterprise.go.tpl"
 	osVersionsTpl     = "calico.go.tpl"