diff --git a/config/enterprise_versions.yml b/config/enterprise_versions.yml index 53f4748e27..401a04816c 100644 --- a/config/enterprise_versions.yml +++ b/config/enterprise_versions.yml @@ -1,132 +1,132 @@ # Components defined here are required to be kept in sync with hack/gen-versions/enterprise.go.tpl -title: v3.14.0 +title: v3.14.0-1 components: libcalico-go: - version: v3.14.0 + version: v3.14.0-1 cnx-manager: image: tigera/cnx-manager - version: v3.14.0 + version: v3.14.0-1 voltron: image: tigera/voltron - version: v3.14.0 + version: v3.14.0-1 cnx-apiserver: image: tigera/cnx-apiserver - version: v3.14.0 + version: v3.14.0-1 cnx-queryserver: image: tigera/cnx-queryserver - version: v3.14.0 + version: v3.14.0-1 cnx-kube-controllers: image: tigera/kube-controllers - version: v3.14.0 + version: v3.14.0-1 typha: image: tigera/typha - version: v3.14.0 + version: v3.14.0-1 cnx-node: image: tigera/cnx-node - version: v3.14.0 + version: v3.14.0-1 fluentd: image: tigera/fluentd - version: v3.14.0 + version: v3.14.0-1 fluentd-windows: image: tigera/fluentd-windows - version: v3.14.0 + version: v3.14.0-1 es-proxy: image: tigera/es-proxy - version: v3.14.0 + version: v3.14.0-1 es-gateway: image: tigera/es-gateway - version: v3.14.0 + version: v3.14.0-1 dex: image: tigera/dex - version: v3.14.0 + version: v3.14.0-1 eck-kibana: version: 7.16.2 kibana: image: tigera/kibana - version: v3.14.0 + version: v3.14.0-1 eck-elasticsearch: version: 7.16.2 elasticsearch: image: tigera/elasticsearch - version: v3.14.0 + version: v3.14.0-1 elastic-tsee-installer: image: tigera/intrusion-detection-job-installer - version: v3.14.0 + version: v3.14.0-1 es-curator: image: tigera/es-curator - version: v3.14.0 + version: v3.14.0-1 intrusion-detection-controller: image: tigera/intrusion-detection-controller - version: v3.14.0 + version: v3.14.0-1 anomaly_detection_jobs: image: tigera/anomaly_detection_jobs - version: v3.14.0 + version: v3.14.0-1 compliance-controller: image: tigera/compliance-controller - version: v3.14.0 + version: v3.14.0-1 compliance-reporter: image: tigera/compliance-reporter - version: v3.14.0 + version: v3.14.0-1 compliance-snapshotter: image: tigera/compliance-snapshotter - version: v3.14.0 + version: v3.14.0-1 compliance-server: image: tigera/compliance-server - version: v3.14.0 + version: v3.14.0-1 compliance-benchmarker: image: tigera/compliance-benchmarker - version: v3.14.0 + version: v3.14.0-1 guardian: image: tigera/guardian - version: v3.14.0 + version: v3.14.0-1 tigera-cni: image: tigera/cni - version: v3.14.0 + version: v3.14.0-1 cloud-controllers: image: tigera/cloud-controllers - version: v3.14.0 + version: v3.14.0-1 elasticsearch-metrics: image: tigera/elasticsearch-metrics - version: v3.14.0 + version: v3.14.0-1 packetcapture-api: image: tigera/packetcapture-api - version: v3.14.0 + version: v3.14.0-1 # 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: v3.14.0 + version: v3.14.0-1 # 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: v3.14.0 + version: v3.14.0-1 tigera-prometheus-service: image: tigera/prometheus-service - version: v3.14.0 + version: v3.14.0-1 deep-packet-inspection: image: tigera/deep-packet-inspection - version: v3.14.0 + version: v3.14.0-1 windows: image: tigera/calico-windows-upgrade - version: v3.14.0 + version: v3.14.0-1 # 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: v3.14.0 + version: v3.14.0-1 eck-elasticsearch-operator: version: 1.8.0 l7-collector: image: tigera/l7-collector - version: v3.14.0 + version: v3.14.0-1 envoy: image: tigera/envoy - version: v3.14.0 + version: v3.14.0-1 dikastes: image: tigera/dikastes - version: v3.14.0 + version: v3.14.0-1 diff --git a/hack/gen-versions/enterprise.go.tpl b/hack/gen-versions/enterprise.go.tpl index 9651b35a4f..6b9eb08e94 100644 --- a/hack/gen-versions/enterprise.go.tpl +++ b/hack/gen-versions/enterprise.go.tpl @@ -1,4 +1,4 @@ -// Copyright (c) 2020-2021 Tigera, Inc. All rights reserved. +// Copyright (c) 2020-2022 Tigera, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/components/enterprise.go b/pkg/components/enterprise.go index 57fa88fe11..317da319a7 100644 --- a/pkg/components/enterprise.go +++ b/pkg/components/enterprise.go @@ -1,4 +1,4 @@ -// Copyright (c) 2020-2021 Tigera, Inc. All rights reserved. +// Copyright (c) 2020-2022 Tigera, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,40 +18,40 @@ package components var ( - EnterpriseRelease string = "v3.14.0" + EnterpriseRelease string = "v3.14.0-1" ComponentAPIServer = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/cnx-apiserver", } ComponentComplianceBenchmarker = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/compliance-benchmarker", } ComponentComplianceController = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/compliance-controller", } ComponentComplianceReporter = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/compliance-reporter", } ComponentComplianceServer = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/compliance-server", } ComponentComplianceSnapshotter = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/compliance-snapshotter", } ComponentDeepPacketInspection = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/deep-packet-inspection", } @@ -66,12 +66,12 @@ var ( } ComponentElasticTseeInstaller = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/intrusion-detection-job-installer", } ComponentElasticsearch = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/elasticsearch", } @@ -81,87 +81,87 @@ var ( } ComponentElasticsearchOperator = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/eck-operator", } ComponentEsCurator = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/es-curator", } ComponentEsProxy = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/es-proxy", } ComponentESGateway = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/es-gateway", } ComponentFluentd = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/fluentd", } ComponentFluentdWindows = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/fluentd-windows", } ComponentGuardian = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/guardian", } ComponentIntrusionDetectionController = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/intrusion-detection-controller", } ComponentAnomalyDetectionJobs = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/anomaly_detection_jobs", } ComponentKibana = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/kibana", } ComponentManager = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/cnx-manager", } ComponentDex = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/dex", } ComponentManagerProxy = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/voltron", } ComponentPacketCapture = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/packetcapture-api", } ComponentL7Collector = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/l7-collector", } ComponentEnvoyProxy = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/envoy", } ComponentDikastes = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/dikastes", } @@ -171,12 +171,12 @@ var ( } ComponentPrometheus = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/prometheus", } ComponentTigeraPrometheusService = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/prometheus-service", } @@ -186,47 +186,47 @@ var ( } ComponentPrometheusAlertmanager = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/alertmanager", } ComponentQueryServer = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/cnx-queryserver", } ComponentTigeraKubeControllers = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/kube-controllers", } ComponentTigeraNode = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/cnx-node", } ComponentTigeraTypha = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/typha", } ComponentTigeraCNI = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/cni", } ComponentCloudControllers = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/cloud-controllers", } ComponentElasticsearchMetrics = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/elasticsearch-metrics", } ComponentTigeraWindows = component{ - Version: "v3.14.0", + Version: "v3.14.0-1", Image: "tigera/calico-windows-upgrade", } EnterpriseComponents = []component{