diff --git a/config/common_versions.yml b/config/common_versions.yml index 260969f37b..586cdf211a 100644 --- a/config/common_versions.yml +++ b/config/common_versions.yml @@ -1,5 +1,5 @@ -title: v1.1.4 +title: v1.1.5 components: key-cert-provisioner: image: tigera/key-cert-provisioner - version: v1.1.4 + version: v1.1.5 diff --git a/config/enterprise_versions.yml b/config/enterprise_versions.yml index 3b9e412b0e..85e5ee3439 100644 --- a/config/enterprise_versions.yml +++ b/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: release-calient-v3.15 +title: v3.15.0 components: libcalico-go: - version: release-calient-v3.15 + version: v3.15.0 cnx-manager: image: tigera/cnx-manager - version: release-calient-v3.15 + version: v3.15.0 voltron: image: tigera/voltron - version: release-calient-v3.15 + version: v3.15.0 cnx-apiserver: image: tigera/cnx-apiserver - version: release-calient-v3.15 + version: v3.15.0 cnx-queryserver: image: tigera/cnx-queryserver - version: release-calient-v3.15 + version: v3.15.0 cnx-kube-controllers: image: tigera/kube-controllers - version: release-calient-v3.15 + version: v3.15.0 typha: image: tigera/typha - version: release-calient-v3.15 + version: v3.15.0 cnx-node: image: tigera/cnx-node - version: release-calient-v3.15 + version: v3.15.0 fluentd: image: tigera/fluentd - version: release-calient-v3.15 + version: v3.15.0 fluentd-windows: image: tigera/fluentd-windows - version: release-calient-v3.15 + version: v3.15.0 es-proxy: image: tigera/es-proxy - version: release-calient-v3.15 + version: v3.15.0 es-gateway: image: tigera/es-gateway - version: release-calient-v3.15 + version: v3.15.0 dex: image: tigera/dex - version: release-calient-v3.15 + version: v3.15.0 eck-kibana: version: 7.17.5 kibana: image: tigera/kibana - version: release-calient-v3.15 + version: v3.15.0 eck-elasticsearch: version: 7.17.6 elasticsearch: image: tigera/elasticsearch - version: release-calient-v3.15 + version: v3.15.0 elastic-tsee-installer: image: tigera/intrusion-detection-job-installer - version: release-calient-v3.15 + version: v3.15.0 es-curator: image: tigera/es-curator - version: release-calient-v3.15 + version: v3.15.0 intrusion-detection-controller: image: tigera/intrusion-detection-controller - version: release-calient-v3.15 + version: v3.15.0 anomaly_detection_jobs: image: tigera/anomaly_detection_jobs - version: release-calient-v3.15 + version: v3.15.0 anomaly-detection-api: image: tigera/anomaly-detection-api - version: release-calient-v3.15 + version: v3.15.0 compliance-controller: image: tigera/compliance-controller - version: release-calient-v3.15 + version: v3.15.0 compliance-reporter: image: tigera/compliance-reporter - version: release-calient-v3.15 + version: v3.15.0 compliance-snapshotter: image: tigera/compliance-snapshotter - version: release-calient-v3.15 + version: v3.15.0 compliance-server: image: tigera/compliance-server - version: release-calient-v3.15 + version: v3.15.0 compliance-benchmarker: image: tigera/compliance-benchmarker - version: release-calient-v3.15 + version: v3.15.0 guardian: image: tigera/guardian - version: release-calient-v3.15 + version: v3.15.0 tigera-cni: image: tigera/cni - version: release-calient-v3.15 + version: v3.15.0 cloud-controllers: image: tigera/cloud-controllers - version: release-calient-v3.15 + version: v3.15.0 elasticsearch-metrics: image: tigera/elasticsearch-metrics - version: release-calient-v3.15 + version: v3.15.0 packetcapture: image: tigera/packetcapture - version: release-calient-v3.15 + 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.1 prometheus: image: tigera/prometheus - version: release-calient-v3.15 + 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: release-calient-v3.15 + version: v3.15.0 tigera-prometheus-service: image: tigera/prometheus-service - version: release-calient-v3.15 + version: v3.15.0 deep-packet-inspection: image: tigera/deep-packet-inspection - version: release-calient-v3.15 + version: v3.15.0 windows-upgrade: image: tigera/calico-windows-upgrade - version: release-calient-v3.15 + 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: release-calient-v3.15 + version: v3.15.0 eck-elasticsearch-operator: version: 2.5.0 l7-collector: image: tigera/l7-collector - version: release-calient-v3.15 + version: v3.15.0 envoy: image: tigera/envoy - version: release-calient-v3.15 + version: v3.15.0 dikastes: image: tigera/dikastes - version: release-calient-v3.15 + version: v3.15.0 diff --git a/pkg/components/common.go b/pkg/components/common.go index 2d1827bf22..4489304a95 100644 --- a/pkg/components/common.go +++ b/pkg/components/common.go @@ -16,7 +16,7 @@ package components var ( ComponentCSRInitContainer = component{ - Version: "v1.1.4", + Version: "v1.1.5", Image: "tigera/key-cert-provisioner", } CommonImages = []component{ diff --git a/pkg/components/enterprise.go b/pkg/components/enterprise.go index 396c6d1c5c..471f3d73ff 100644 --- a/pkg/components/enterprise.go +++ b/pkg/components/enterprise.go @@ -18,40 +18,40 @@ package components var ( - EnterpriseRelease string = "release-calient-v3.15" + EnterpriseRelease string = "v3.15.0" ComponentAPIServer = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/cnx-apiserver", } ComponentComplianceBenchmarker = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/compliance-benchmarker", } ComponentComplianceController = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/compliance-controller", } ComponentComplianceReporter = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/compliance-reporter", } ComponentComplianceServer = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/compliance-server", } ComponentComplianceSnapshotter = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/compliance-snapshotter", } ComponentDeepPacketInspection = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/deep-packet-inspection", } @@ -64,17 +64,17 @@ var ( } ComponentElasticTseeInstaller = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/intrusion-detection-job-installer", } ComponentElasticsearch = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/elasticsearch", } ComponentElasticsearchFIPS = component{ - Version: "release-calient-v3.15-fips", + Version: "v3.15.0-fips", Image: "tigera/elasticsearch", } @@ -83,92 +83,92 @@ var ( } ComponentElasticsearchOperator = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/eck-operator", } ComponentEsCurator = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/es-curator", } ComponentEsProxy = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/es-proxy", } ComponentESGateway = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/es-gateway", } ComponentFluentd = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/fluentd", } ComponentFluentdWindows = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/fluentd-windows", } ComponentGuardian = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/guardian", } ComponentIntrusionDetectionController = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/intrusion-detection-controller", } ComponentAnomalyDetectionJobs = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/anomaly_detection_jobs", } ComponentAnomalyDetectionAPI = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/anomaly-detection-api", } ComponentKibana = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/kibana", } ComponentManager = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/cnx-manager", } ComponentDex = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/dex", } ComponentManagerProxy = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/voltron", } ComponentPacketCapture = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/packetcapture", } ComponentL7Collector = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/l7-collector", } ComponentEnvoyProxy = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/envoy", } ComponentDikastes = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/dikastes", } @@ -177,12 +177,12 @@ var ( } ComponentPrometheus = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/prometheus", } ComponentTigeraPrometheusService = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/prometheus-service", } @@ -191,52 +191,52 @@ var ( } ComponentPrometheusAlertmanager = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/alertmanager", } ComponentQueryServer = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/cnx-queryserver", } ComponentTigeraKubeControllers = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/kube-controllers", } ComponentTigeraNode = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/cnx-node", } ComponentTigeraTypha = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/typha", } ComponentTigeraCNI = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/cni", } ComponentTigeraCNIFIPS = component{ - Version: "release-calient-v3.15-fips", + Version: "v3.15.0-fips", Image: "tigera/cni", } ComponentCloudControllers = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/cloud-controllers", } ComponentElasticsearchMetrics = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/elasticsearch-metrics", } ComponentTigeraWindowsUpgrade = component{ - Version: "release-calient-v3.15", + Version: "v3.15.0", Image: "tigera/calico-windows-upgrade", } // Only components that correspond directly to images should be included in this list, diff --git a/pkg/components/images.go b/pkg/components/images.go index 00eadd3268..15d03505aa 100644 --- a/pkg/components/images.go +++ b/pkg/components/images.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -16,7 +16,7 @@ package components // Default registries for Calico and Tigera. const ( CalicoRegistry = "docker.io/" - TigeraRegistry = "gcr.io/unique-caldron-775/cnx/" + TigeraRegistry = "quay.io/" // For production InitRegistry should match TigeraRegistry. // For the master branch and other testing scenarios we switch TigeraRegistry to // point to a testing repo but the init image will be pushed to quay, so having