From 4e45a51a6fecddd3badaf7383784b6e209cc5210 Mon Sep 17 00:00:00 2001 From: Daniel Fox Date: Thu, 12 Oct 2023 15:04:07 -0700 Subject: [PATCH] Update versions for v1.31.2/v3.18.0-1.1 (#2928) --- config/common_versions.yml | 4 +- config/enterprise_versions.yml | 92 ++++++++++++++++----------------- pkg/components/common.go | 2 +- pkg/components/enterprise.go | 94 +++++++++++++++++----------------- 4 files changed, 96 insertions(+), 96 deletions(-) diff --git a/config/common_versions.yml b/config/common_versions.yml index 4966ab81e1..d0e7b0831f 100644 --- a/config/common_versions.yml +++ b/config/common_versions.yml @@ -1,5 +1,5 @@ -title: v1.1.11 +title: v1.1.13 components: key-cert-provisioner: image: tigera/key-cert-provisioner - version: v1.1.11 + version: v1.1.13 diff --git a/config/enterprise_versions.yml b/config/enterprise_versions.yml index 983455cc37..e8e54761c6 100644 --- a/config/enterprise_versions.yml +++ b/config/enterprise_versions.yml @@ -1,153 +1,153 @@ # Components defined here are required to be kept in sync with hack/gen-versions/enterprise.go.tpl -title: v3.18.0 +title: v3.18.0-1.1 components: libcalico-go: - version: v3.18.0 + version: v3.18.0-1.1 cnx-manager: image: tigera/cnx-manager - version: v3.18.0 + version: v3.18.0-1.1 voltron: image: tigera/voltron - version: v3.18.0 + version: v3.18.0-1.1 cnx-apiserver: image: tigera/cnx-apiserver - version: v3.18.0 + version: v3.18.0-1.1 cnx-queryserver: image: tigera/cnx-queryserver - version: v3.18.0 + version: v3.18.0-1.1 cnx-kube-controllers: image: tigera/kube-controllers - version: v3.18.0 + version: v3.18.0-1.1 typha: image: tigera/typha - version: v3.18.0 + version: v3.18.0-1.1 cnx-node: image: tigera/cnx-node - version: v3.18.0 + version: v3.18.0-1.1 fluentd: image: tigera/fluentd - version: v3.18.0 + version: v3.18.0-1.1 fluentd-windows: image: tigera/fluentd-windows - version: v3.18.0 + version: v3.18.0-1.1 es-proxy: image: tigera/es-proxy - version: v3.18.0 + version: v3.18.0-1.1 linseed: image: tigera/linseed - version: v3.18.0 + version: v3.18.0-1.1 es-gateway: image: tigera/es-gateway - version: v3.18.0 + version: v3.18.0-1.1 dex: image: tigera/dex - version: v3.18.0 + version: v3.18.0-1.1 eck-kibana: version: 7.17.13 kibana: image: tigera/kibana - version: v3.18.0 + version: v3.18.0-1.1 eck-elasticsearch: version: 7.17.13 elasticsearch: image: tigera/elasticsearch - version: v3.18.0 + version: v3.18.0-1.1 elastic-tsee-installer: image: tigera/intrusion-detection-job-installer - version: v3.18.0 + version: v3.18.0-1.1 es-curator: image: tigera/es-curator - version: v3.18.0 + version: v3.18.0-1.1 intrusion-detection-controller: image: tigera/intrusion-detection-controller - version: v3.18.0 + version: v3.18.0-1.1 anomaly_detection_jobs: image: tigera/anomaly_detection_jobs - version: v3.18.0 + version: v3.18.0-1.1 anomaly-detection-api: image: tigera/anomaly-detection-api - version: v3.18.0 + version: v3.18.0-1.1 compliance-controller: image: tigera/compliance-controller - version: v3.18.0 + version: v3.18.0-1.1 compliance-reporter: image: tigera/compliance-reporter - version: v3.18.0 + version: v3.18.0-1.1 compliance-snapshotter: image: tigera/compliance-snapshotter - version: v3.18.0 + version: v3.18.0-1.1 compliance-server: image: tigera/compliance-server - version: v3.18.0 + version: v3.18.0-1.1 compliance-benchmarker: image: tigera/compliance-benchmarker - version: v3.18.0 + version: v3.18.0-1.1 guardian: image: tigera/guardian - version: v3.18.0 + version: v3.18.0-1.1 tigera-cni: image: tigera/cni - version: v3.18.0 + version: v3.18.0-1.1 cloud-controllers: image: tigera/cloud-controllers - version: v3.18.0 + version: v3.18.0-1.1 elasticsearch-metrics: image: tigera/elasticsearch-metrics - version: v3.18.0 + version: v3.18.0-1.1 packetcapture: image: tigera/packetcapture - version: v3.18.0 + version: v3.18.0-1.1 policy-recommendation: image: tigera/policy-recommendation - version: v3.18.0 + version: v3.18.0-1.1 # coreos-prometheus holds the version of prometheus built for tigera/prometheus, # which prometheus operator uses to validate. coreos-prometheus: version: v2.45.0 prometheus: image: tigera/prometheus - version: v3.18.0 + version: v3.18.0-1.1 # coreos-prometheus holds the version of alertmanager built for tigera/alertmanager, # which prometheus operator uses to validate. coreos-alertmanager: version: v0.25.1 alertmanager: image: tigera/alertmanager - version: v3.18.0 + version: v3.18.0-1.1 tigera-prometheus-service: image: tigera/prometheus-service - version: v3.18.0 + version: v3.18.0-1.1 deep-packet-inspection: image: tigera/deep-packet-inspection - version: v3.18.0 + version: v3.18.0-1.1 windows-upgrade: image: tigera/calico-windows-upgrade - version: v3.18.0 + version: v3.18.0-1.1 flexvol: image: tigera/pod2daemon-flexvol - version: v3.18.0 + version: v3.18.0-1.1 csi: image: tigera/csi - version: v3.18.0 + version: v3.18.0-1.1 csi-node-driver-registrar: image: tigera/node-driver-registrar - version: v3.18.0 + version: v3.18.0-1.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.18.0 + version: v3.18.0-1.1 eck-elasticsearch-operator: version: 2.6.1 l7-collector: image: tigera/l7-collector - version: v3.18.0 + version: v3.18.0-1.1 envoy: image: tigera/envoy - version: v3.18.0 + version: v3.18.0-1.1 dikastes: image: tigera/dikastes - version: v3.18.0 + version: v3.18.0-1.1 egress-gateway: image: tigera/egress-gateway - version: v3.18.0 + version: v3.18.0-1.1 diff --git a/pkg/components/common.go b/pkg/components/common.go index 531df1d726..cc3ab61100 100644 --- a/pkg/components/common.go +++ b/pkg/components/common.go @@ -16,7 +16,7 @@ package components var ( ComponentCSRInitContainer = component{ - Version: "v1.1.11", + Version: "v1.1.13", Image: "tigera/key-cert-provisioner", Registry: "", } diff --git a/pkg/components/enterprise.go b/pkg/components/enterprise.go index a00b3ad66a..aeae2e3de6 100644 --- a/pkg/components/enterprise.go +++ b/pkg/components/enterprise.go @@ -18,46 +18,46 @@ package components var ( - EnterpriseRelease string = "v3.18.0" + EnterpriseRelease string = "v3.18.0-1.1" ComponentAPIServer = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/cnx-apiserver", Registry: "", } ComponentComplianceBenchmarker = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/compliance-benchmarker", Registry: "", } ComponentComplianceController = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/compliance-controller", Registry: "", } ComponentComplianceReporter = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/compliance-reporter", Registry: "", } ComponentComplianceServer = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/compliance-server", Registry: "", } ComponentComplianceSnapshotter = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/compliance-snapshotter", Registry: "", } ComponentDeepPacketInspection = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/deep-packet-inspection", Registry: "", } @@ -73,19 +73,19 @@ var ( } ComponentElasticTseeInstaller = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/intrusion-detection-job-installer", Registry: "", } ComponentElasticsearch = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/elasticsearch", Registry: "", } ComponentElasticsearchFIPS = component{ - Version: "v3.18.0-fips", + Version: "v3.18.0-1.1-fips", Image: "tigera/elasticsearch", Registry: "", } @@ -96,127 +96,127 @@ var ( } ComponentElasticsearchOperator = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/eck-operator", Registry: "", } ComponentEsCurator = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/es-curator", Registry: "", } ComponentEsProxy = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/es-proxy", Registry: "", } ComponentESGateway = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/es-gateway", Registry: "", } ComponentLinseed = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/linseed", Registry: "", } ComponentFluentd = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/fluentd", Registry: "", } ComponentFluentdWindows = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/fluentd-windows", Registry: "", } ComponentGuardian = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/guardian", Registry: "", } ComponentIntrusionDetectionController = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/intrusion-detection-controller", Registry: "", } ComponentAnomalyDetectionJobs = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/anomaly_detection_jobs", Registry: "", } ComponentAnomalyDetectionAPI = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/anomaly-detection-api", Registry: "", } ComponentKibana = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/kibana", Registry: "", } ComponentManager = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/cnx-manager", Registry: "", } ComponentDex = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/dex", Registry: "", } ComponentManagerProxy = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/voltron", Registry: "", } ComponentPacketCapture = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/packetcapture", Registry: "", } ComponentPolicyRecommendation = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/policy-recommendation", Registry: "", } ComponentEgressGateway = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/egress-gateway", Registry: "", } ComponentL7Collector = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/l7-collector", Registry: "", } ComponentEnvoyProxy = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/envoy", Registry: "", } ComponentDikastes = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/dikastes", Registry: "", } @@ -227,13 +227,13 @@ var ( } ComponentPrometheus = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/prometheus", Registry: "", } ComponentTigeraPrometheusService = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/prometheus-service", Registry: "", } @@ -244,79 +244,79 @@ var ( } ComponentPrometheusAlertmanager = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/alertmanager", Registry: "", } ComponentQueryServer = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/cnx-queryserver", Registry: "", } ComponentTigeraKubeControllers = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/kube-controllers", Registry: "", } ComponentTigeraNode = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/cnx-node", Registry: "", } ComponentTigeraTypha = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/typha", Registry: "", } ComponentTigeraCNI = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/cni", Registry: "", } ComponentTigeraCNIFIPS = component{ - Version: "v3.18.0-fips", + Version: "v3.18.0-1.1-fips", Image: "tigera/cni", Registry: "", } ComponentCloudControllers = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/cloud-controllers", Registry: "", } ComponentElasticsearchMetrics = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/elasticsearch-metrics", Registry: "", } ComponentTigeraWindowsUpgrade = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/calico-windows-upgrade", Registry: "", } ComponentFlexVolumePrivate = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/pod2daemon-flexvol", Registry: "", } ComponentCSIPrivate = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/csi", Registry: "", } ComponentCSINodeDriverRegistrarPrivate = component{ - Version: "v3.18.0", + Version: "v3.18.0-1.1", Image: "tigera/node-driver-registrar", Registry: "", }