From f8a415fac50c0288d3526d9883c5d8f4a7d7c863 Mon Sep 17 00:00:00 2001 From: Rene Dekker Date: Tue, 12 Apr 2022 13:33:38 -0700 Subject: [PATCH] Set the images for v1.25.5 to include enterprise release v3.12.2 (#1898) * Set the images for v1.25.5 to include enterprise release v3.12.2 --- config/enterprise_versions.yml | 74 +++++++++---------- pkg/components/enterprise.go | 72 +++++++++--------- .../crd.projectcalico.org_ipamblocks.yaml | 38 ++++++++++ 3 files changed, 111 insertions(+), 73 deletions(-) diff --git a/config/enterprise_versions.yml b/config/enterprise_versions.yml index 0f66fb7444..37dfb45163 100644 --- a/config/enterprise_versions.yml +++ b/config/enterprise_versions.yml @@ -1,125 +1,125 @@ -title: v3.12.1 +title: v3.12.2 components: libcalico-go: - version: v3.12.1 + version: v3.12.2 cnx-manager: image: tigera/cnx-manager - version: v3.12.1 + version: v3.12.2 voltron: image: tigera/voltron - version: v3.12.1 + version: v3.12.2 cnx-apiserver: image: tigera/cnx-apiserver - version: v3.12.1 + version: v3.12.2 cnx-queryserver: image: tigera/cnx-queryserver - version: v3.12.1 + version: v3.12.2 cnx-kube-controllers: image: tigera/kube-controllers - version: v3.12.1 + version: v3.12.2 typha: image: tigera/typha - version: v3.12.1 + version: v3.12.2 cnx-node: image: tigera/cnx-node - version: v3.12.1 + version: v3.12.2 fluentd: image: tigera/fluentd - version: v3.12.1 + version: v3.12.2 fluentd-windows: image: tigera/fluentd-windows - version: v3.12.1 + version: v3.12.2 es-proxy: image: tigera/es-proxy - version: v3.12.1 + version: v3.12.2 es-gateway: image: tigera/es-gateway - version: v3.12.1 + version: v3.12.2 dex: image: tigera/dex - version: v3.12.1 + version: v3.12.2 eck-kibana: version: 7.16.2 kibana: image: tigera/kibana - version: v3.12.1 + version: v3.12.2 eck-elasticsearch: version: 7.16.2 elasticsearch: image: tigera/elasticsearch - version: v3.12.1 + version: v3.12.2 elastic-tsee-installer: image: tigera/intrusion-detection-job-installer - version: v3.12.1 + version: v3.12.2 es-curator: image: tigera/es-curator - version: v3.12.1 + version: v3.12.2 intrusion-detection-controller: image: tigera/intrusion-detection-controller - version: v3.12.1 + version: v3.12.2 compliance-controller: image: tigera/compliance-controller - version: v3.12.1 + version: v3.12.2 compliance-reporter: image: tigera/compliance-reporter - version: v3.12.1 + version: v3.12.2 compliance-snapshotter: image: tigera/compliance-snapshotter - version: v3.12.1 + version: v3.12.2 compliance-server: image: tigera/compliance-server - version: v3.12.1 + version: v3.12.2 compliance-benchmarker: image: tigera/compliance-benchmarker - version: v3.12.1 + version: v3.12.2 guardian: image: tigera/guardian - version: v3.12.1 + version: v3.12.2 tigera-cni: image: tigera/cni - version: v3.12.1 + version: v3.12.2 cloud-controllers: image: tigera/cloud-controllers - version: v3.12.1 + version: v3.12.2 elasticsearch-metrics: image: tigera/elasticsearch-metrics - version: v3.12.1 + version: v3.12.2 packetcapture-api: image: tigera/packetcapture-api - version: v3.12.1 + version: v3.12.2 # 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.12.1 + version: v3.12.2 # 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.12.1 + version: v3.12.2 tigera-prometheus-service: image: tigera/prometheus-service - version: v3.12.1 + version: v3.12.2 deep-packet-inspection: image: tigera/deep-packet-inspection - version: v3.12.1 + version: v3.12.2 windows: image: tigera/calico-windows-upgrade - version: v3.12.1 + version: v3.12.2 # 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.12.1 + version: v3.12.2 eck-elasticsearch-operator: version: 1.8.0 l7-collector: image: tigera/l7-collector - version: v3.12.1 + version: v3.12.2 envoy: image: tigera/envoy - version: v3.12.1 + version: v3.12.2 diff --git a/pkg/components/enterprise.go b/pkg/components/enterprise.go index 86f0962301..3bdaf5c804 100644 --- a/pkg/components/enterprise.go +++ b/pkg/components/enterprise.go @@ -15,40 +15,40 @@ package components var ( - EnterpriseRelease string = "v3.12.1" + EnterpriseRelease string = "v3.12.2" ComponentAPIServer = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/cnx-apiserver", } ComponentComplianceBenchmarker = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/compliance-benchmarker", } ComponentComplianceController = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/compliance-controller", } ComponentComplianceReporter = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/compliance-reporter", } ComponentComplianceServer = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/compliance-server", } ComponentComplianceSnapshotter = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/compliance-snapshotter", } ComponentDeepPacketInspection = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/deep-packet-inspection", } @@ -63,12 +63,12 @@ var ( } ComponentElasticTseeInstaller = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/intrusion-detection-job-installer", } ComponentElasticsearch = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/elasticsearch", } @@ -78,77 +78,77 @@ var ( } ComponentElasticsearchOperator = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/eck-operator", } ComponentEsCurator = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/es-curator", } ComponentEsProxy = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/es-proxy", } ComponentESGateway = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/es-gateway", } ComponentFluentd = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/fluentd", } ComponentFluentdWindows = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/fluentd-windows", } ComponentGuardian = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/guardian", } ComponentIntrusionDetectionController = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/intrusion-detection-controller", } ComponentKibana = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/kibana", } ComponentManager = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/cnx-manager", } ComponentDex = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/dex", } ComponentManagerProxy = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/voltron", } ComponentPacketCapture = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/packetcapture-api", } ComponentL7Collector = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/l7-collector", } ComponentEnvoyProxy = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/envoy", } @@ -158,12 +158,12 @@ var ( } ComponentPrometheus = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/prometheus", } ComponentTigeraPrometheusService = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/prometheus-service", } @@ -173,47 +173,47 @@ var ( } ComponentPrometheusAlertmanager = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/alertmanager", } ComponentQueryServer = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/cnx-queryserver", } ComponentTigeraKubeControllers = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/kube-controllers", } ComponentTigeraNode = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/cnx-node", } ComponentTigeraTypha = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/typha", } ComponentTigeraCNI = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/cni", } ComponentCloudControllers = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/cloud-controllers", } ComponentElasticsearchMetrics = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/elasticsearch-metrics", } ComponentTigeraWindows = component{ - Version: "v3.12.1", + Version: "v3.12.2", Image: "tigera/calico-windows-upgrade", } EnterpriseComponents = []component{ diff --git a/pkg/crds/enterprise/crd.projectcalico.org_ipamblocks.yaml b/pkg/crds/enterprise/crd.projectcalico.org_ipamblocks.yaml index eb1472f939..b38a938816 100644 --- a/pkg/crds/enterprise/crd.projectcalico.org_ipamblocks.yaml +++ b/pkg/crds/enterprise/crd.projectcalico.org_ipamblocks.yaml @@ -34,8 +34,16 @@ spec: resource. properties: affinity: + description: Affinity of the block, if this block has one. If set, + it will be of the form "host:". If not set, this block + is not affine to a host. type: string allocations: + description: Array of allocations in-use within this block. nil entries + mean the allocation is free. For non-nil entries at index i, the + index is the ordinal of the allocation within this block and the + value is the index of the associated attributes in the Attributes + array. items: type: integer # TODO: This nullable is manually added in. We should update controller-gen @@ -43,6 +51,10 @@ spec: nullable: true type: array attributes: + description: Attributes is an array of arbitrary metadata associated + with allocations in the block. To find attributes for a given allocation, + use the value of the allocation's entry in the Allocations array + as the index of the element in this array. items: properties: handle_id: @@ -54,12 +66,38 @@ spec: type: object type: array cidr: + description: The block's CIDR. type: string deleted: + description: Deleted is an internal boolean used to workaround a limitation + in the Kubernetes API whereby deletion will not return a conflict + error if the block has been updated. It should not be set manually. type: boolean + sequenceNumber: + default: 0 + description: We store a sequence number that is updated each time + the block is written. Each allocation will also store the sequence + number of the block at the time of its creation. When releasing + an IP, passing the sequence number associated with the allocation + allows us to protect against a race condition and ensure the IP + hasn't been released and re-allocated since the release request. + format: int64 + type: integer + sequenceNumberForAllocation: + additionalProperties: + format: int64 + type: integer + description: Map of allocated ordinal within the block to sequence + number of the block at the time of allocation. Kubernetes does not + allow numerical keys for maps, so the key is cast to a string. + type: object strictAffinity: + description: StrictAffinity on the IPAMBlock is deprecated and no + longer used by the code. Use IPAMConfig StrictAffinity instead. type: boolean unallocated: + description: Unallocated is an ordered list of allocations which are + free in the block. items: type: integer type: array