From fd551e2aafa3881948f1e048385bf2d1243a492a Mon Sep 17 00:00:00 2001 From: Daniel Fox Date: Thu, 31 Aug 2023 12:31:00 -0700 Subject: [PATCH] Update versions for v3.18.0 (#2845) * Update versions for v3.18.0 * Update CoreOS component versions * Gen-versions for new CoreOS updates --- config/calico_versions.yml | 22 ++--- config/common_versions.yml | 4 +- config/enterprise_versions.yml | 96 +++++++++--------- pkg/components/calico.go | 34 +++---- pkg/components/common.go | 2 +- pkg/components/enterprise.go | 98 +++++++++---------- ...projectcalico.org_felixconfigurations.yaml | 70 +------------ ...alico.org_remoteclusterconfigurations.yaml | 20 ---- 8 files changed, 129 insertions(+), 217 deletions(-) diff --git a/config/calico_versions.yml b/config/calico_versions.yml index e778dadcce..8ad2524d81 100644 --- a/config/calico_versions.yml +++ b/config/calico_versions.yml @@ -1,23 +1,23 @@ # Components defined here are required to be kept in sync with hack/gen-versions/calico.go.tpl -title: master +title: v3.26.1 components: libcalico-go: - version: master + version: v3.26.1 typha: - version: master + version: v3.26.1 calico/node: - version: master + version: v3.26.1 calico/cni: - version: master + version: v3.26.1 calico/kube-controllers: - version: master + version: v3.26.1 flexvol: - version: master + version: v3.26.1 calico/apiserver: - version: master + version: v3.26.1 calico/windows-upgrade: - version: master + version: v3.26.1 calico/csi: - version: master + version: v3.26.1 csi-node-driver-registrar: - version: master + version: v3.26.1 diff --git a/config/common_versions.yml b/config/common_versions.yml index 826f579db0..4966ab81e1 100644 --- a/config/common_versions.yml +++ b/config/common_versions.yml @@ -1,5 +1,5 @@ -title: master +title: v1.1.11 components: key-cert-provisioner: image: tigera/key-cert-provisioner - version: master + version: v1.1.11 diff --git a/config/enterprise_versions.yml b/config/enterprise_versions.yml index 3e9cead407..82111ca1d5 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: master +title: v3.18.0 components: libcalico-go: - version: master + version: v3.18.0 cnx-manager: image: tigera/cnx-manager - version: master + version: v3.18.0 voltron: image: tigera/voltron - version: master + version: v3.18.0 cnx-apiserver: image: tigera/cnx-apiserver - version: master + version: v3.18.0 cnx-queryserver: image: tigera/cnx-queryserver - version: master + version: v3.18.0 cnx-kube-controllers: image: tigera/kube-controllers - version: master + version: v3.18.0 typha: image: tigera/typha - version: master + version: v3.18.0 cnx-node: image: tigera/cnx-node - version: master + version: v3.18.0 fluentd: image: tigera/fluentd - version: master + version: v3.18.0 fluentd-windows: image: tigera/fluentd-windows - version: master + version: v3.18.0 es-proxy: image: tigera/es-proxy - version: master + version: v3.18.0 linseed: image: tigera/linseed - version: master + version: v3.18.0 es-gateway: image: tigera/es-gateway - version: master + version: v3.18.0 dex: image: tigera/dex - version: master + version: v3.18.0 eck-kibana: version: 7.17.11 kibana: image: tigera/kibana - version: master + version: v3.18.0 eck-elasticsearch: version: 7.17.11 elasticsearch: image: tigera/elasticsearch - version: master + version: v3.18.0 elastic-tsee-installer: image: tigera/intrusion-detection-job-installer - version: master + version: v3.18.0 es-curator: image: tigera/es-curator - version: master + version: v3.18.0 intrusion-detection-controller: image: tigera/intrusion-detection-controller - version: master + version: v3.18.0 anomaly_detection_jobs: image: tigera/anomaly_detection_jobs - version: master + version: v3.18.0 anomaly-detection-api: image: tigera/anomaly-detection-api - version: master + version: v3.18.0 compliance-controller: image: tigera/compliance-controller - version: master + version: v3.18.0 compliance-reporter: image: tigera/compliance-reporter - version: master + version: v3.18.0 compliance-snapshotter: image: tigera/compliance-snapshotter - version: master + version: v3.18.0 compliance-server: image: tigera/compliance-server - version: master + version: v3.18.0 compliance-benchmarker: image: tigera/compliance-benchmarker - version: master + version: v3.18.0 guardian: image: tigera/guardian - version: master + version: v3.18.0 tigera-cni: image: tigera/cni - version: master + version: v3.18.0 cloud-controllers: image: tigera/cloud-controllers - version: master + version: v3.18.0 elasticsearch-metrics: image: tigera/elasticsearch-metrics - version: master + version: v3.18.0 packetcapture: image: tigera/packetcapture - version: master + version: v3.18.0 policy-recommendation: image: tigera/policy-recommendation - version: master + version: v3.18.0 # coreos-prometheus holds the version of prometheus built for tigera/prometheus, # which prometheus operator uses to validate. coreos-prometheus: - version: v2.43.1 + version: v2.45.0 prometheus: image: tigera/prometheus - version: master + version: v3.18.0 # coreos-prometheus holds the version of alertmanager built for tigera/alertmanager, # which prometheus operator uses to validate. coreos-alertmanager: - version: v0.25.0 + version: v0.25.1 alertmanager: image: tigera/alertmanager - version: master + version: v3.18.0 tigera-prometheus-service: image: tigera/prometheus-service - version: master + version: v3.18.0 deep-packet-inspection: image: tigera/deep-packet-inspection - version: master + version: v3.18.0 windows-upgrade: image: tigera/calico-windows-upgrade - version: master + version: v3.18.0 flexvol: image: tigera/pod2daemon-flexvol - version: master + version: v3.18.0 csi: image: tigera/csi - version: master + version: v3.18.0 csi-node-driver-registrar: image: tigera/node-driver-registrar - version: master + version: v3.18.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: master + version: v3.18.0 eck-elasticsearch-operator: version: 2.6.1 l7-collector: image: tigera/l7-collector - version: master + version: v3.18.0 envoy: image: tigera/envoy - version: master + version: v3.18.0 dikastes: image: tigera/dikastes - version: master + version: v3.18.0 egress-gateway: image: tigera/egress-gateway - version: master + version: v3.18.0 diff --git a/pkg/components/calico.go b/pkg/components/calico.go index f82e8f2a66..ff295461d4 100644 --- a/pkg/components/calico.go +++ b/pkg/components/calico.go @@ -20,100 +20,100 @@ package components import "github.com/tigera/operator/version" var ( - CalicoRelease string = "master" + CalicoRelease string = "v3.26.1" ComponentCalicoCNI = component{ - Version: "master", + Version: "v3.26.1", Image: "calico/cni", Registry: "", } ComponentCalicoCNIFIPS = component{ - Version: "master-fips", + Version: "v3.26.1-fips", Image: "calico/cni", Registry: "", } ComponentCalicoKubeControllers = component{ - Version: "master", + Version: "v3.26.1", Image: "calico/kube-controllers", Registry: "", } ComponentCalicoKubeControllersFIPS = component{ - Version: "master-fips", + Version: "v3.26.1-fips", Image: "calico/kube-controllers", Registry: "", } ComponentCalicoNode = component{ - Version: "master", + Version: "v3.26.1", Image: "calico/node", Registry: "", } ComponentCalicoNodeFIPS = component{ - Version: "master-fips", + Version: "v3.26.1-fips", Image: "calico/node", Registry: "", } ComponentCalicoTypha = component{ - Version: "master", + Version: "v3.26.1", Image: "calico/typha", Registry: "", } ComponentCalicoTyphaFIPS = component{ - Version: "master-fips", + Version: "v3.26.1-fips", Image: "calico/typha", Registry: "", } ComponentFlexVolume = component{ - Version: "master", + Version: "v3.26.1", Image: "calico/pod2daemon-flexvol", Registry: "", } ComponentCalicoAPIServer = component{ - Version: "master", + Version: "v3.26.1", Image: "calico/apiserver", Registry: "", } ComponentCalicoAPIServerFIPS = component{ - Version: "master-fips", + Version: "v3.26.1-fips", Image: "calico/apiserver", Registry: "", } ComponentWindowsUpgrade = component{ - Version: "master", + Version: "v3.26.1", Image: "calico/windows-upgrade", Registry: "", } ComponentCalicoCSI = component{ - Version: "master", + Version: "v3.26.1", Image: "calico/csi", Registry: "", } ComponentCalicoCSIFIPS = component{ - Version: "master-fips", + Version: "v3.26.1-fips", Image: "calico/csi", Registry: "", } ComponentCalicoCSIRegistrar = component{ - Version: "master", + Version: "v3.26.1", Image: "calico/node-driver-registrar", Registry: "", } ComponentCalicoCSIRegistrarFIPS = component{ - Version: "master-fips", + Version: "v3.26.1-fips", Image: "calico/node-driver-registrar", Registry: "", } diff --git a/pkg/components/common.go b/pkg/components/common.go index e443fe3602..531df1d726 100644 --- a/pkg/components/common.go +++ b/pkg/components/common.go @@ -16,7 +16,7 @@ package components var ( ComponentCSRInitContainer = component{ - Version: "master", + Version: "v1.1.11", Image: "tigera/key-cert-provisioner", Registry: "", } diff --git a/pkg/components/enterprise.go b/pkg/components/enterprise.go index b229a8c674..045bfe9b15 100644 --- a/pkg/components/enterprise.go +++ b/pkg/components/enterprise.go @@ -18,46 +18,46 @@ package components var ( - EnterpriseRelease string = "master" + EnterpriseRelease string = "v3.18.0" ComponentAPIServer = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/cnx-apiserver", Registry: "", } ComponentComplianceBenchmarker = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/compliance-benchmarker", Registry: "", } ComponentComplianceController = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/compliance-controller", Registry: "", } ComponentComplianceReporter = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/compliance-reporter", Registry: "", } ComponentComplianceServer = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/compliance-server", Registry: "", } ComponentComplianceSnapshotter = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/compliance-snapshotter", Registry: "", } ComponentDeepPacketInspection = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/deep-packet-inspection", Registry: "", } @@ -73,19 +73,19 @@ var ( } ComponentElasticTseeInstaller = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/intrusion-detection-job-installer", Registry: "", } ComponentElasticsearch = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/elasticsearch", Registry: "", } ComponentElasticsearchFIPS = component{ - Version: "master-fips", + Version: "v3.18.0-fips", Image: "tigera/elasticsearch", Registry: "", } @@ -96,227 +96,227 @@ var ( } ComponentElasticsearchOperator = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/eck-operator", Registry: "", } ComponentEsCurator = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/es-curator", Registry: "", } ComponentEsProxy = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/es-proxy", Registry: "", } ComponentESGateway = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/es-gateway", Registry: "", } ComponentLinseed = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/linseed", Registry: "", } ComponentFluentd = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/fluentd", Registry: "", } ComponentFluentdWindows = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/fluentd-windows", Registry: "", } ComponentGuardian = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/guardian", Registry: "", } ComponentIntrusionDetectionController = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/intrusion-detection-controller", Registry: "", } ComponentAnomalyDetectionJobs = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/anomaly_detection_jobs", Registry: "", } ComponentAnomalyDetectionAPI = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/anomaly-detection-api", Registry: "", } ComponentKibana = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/kibana", Registry: "", } ComponentManager = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/cnx-manager", Registry: "", } ComponentDex = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/dex", Registry: "", } ComponentManagerProxy = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/voltron", Registry: "", } ComponentPacketCapture = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/packetcapture", Registry: "", } ComponentPolicyRecommendation = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/policy-recommendation", Registry: "", } ComponentEgressGateway = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/egress-gateway", Registry: "", } ComponentL7Collector = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/l7-collector", Registry: "", } ComponentEnvoyProxy = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/envoy", Registry: "", } ComponentDikastes = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/dikastes", Registry: "", } ComponentCoreOSPrometheus = component{ - Version: "v2.43.1", + Version: "v2.45.0", Registry: "", } ComponentPrometheus = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/prometheus", Registry: "", } ComponentTigeraPrometheusService = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/prometheus-service", Registry: "", } ComponentCoreOSAlertmanager = component{ - Version: "v0.25.0", + Version: "v0.25.1", Registry: "", } ComponentPrometheusAlertmanager = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/alertmanager", Registry: "", } ComponentQueryServer = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/cnx-queryserver", Registry: "", } ComponentTigeraKubeControllers = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/kube-controllers", Registry: "", } ComponentTigeraNode = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/cnx-node", Registry: "", } ComponentTigeraTypha = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/typha", Registry: "", } ComponentTigeraCNI = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/cni", Registry: "", } ComponentTigeraCNIFIPS = component{ - Version: "master-fips", + Version: "v3.18.0-fips", Image: "tigera/cni", Registry: "", } ComponentCloudControllers = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/cloud-controllers", Registry: "", } ComponentElasticsearchMetrics = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/elasticsearch-metrics", Registry: "", } ComponentTigeraWindowsUpgrade = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/calico-windows-upgrade", Registry: "", } ComponentFlexVolumePrivate = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/pod2daemon-flexvol", Registry: "", } ComponentCSIPrivate = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/csi", Registry: "", } ComponentCSINodeDriverRegistrarPrivate = component{ - Version: "master", + Version: "v3.18.0", Image: "tigera/node-driver-registrar", Registry: "", } diff --git a/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml b/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml index 8d7e5f9cc2..b3fb2d7347 100644 --- a/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml +++ b/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml @@ -51,13 +51,6 @@ spec: - Enable - Disable type: string - bpfCTLBLogFilter: - description: 'BPFCTLBLogFilter specifies, what is logged by connect - time load balancer when BPFLogLevel is debug. Currently has to be - specified as ''all'' when BPFLogFilters is set to see CTLB logs. - [Default: unset - means logs are emitted when BPFLogLevel id debug - and BPFLogFilters not set.]' - type: string bpfConnectTimeLoadBalancingEnabled: description: 'BPFConnectTimeLoadBalancingEnabled when in BPF mode, controls whether Felix installs the connection-time load balancer. The @@ -82,12 +75,6 @@ spec: the cluster. It should not match the workload interfaces (usually named cali...). type: string - bpfDisableGROForIfaces: - description: BPFDisableGROForIfaces is a regular expression that controls - which interfaces Felix should disable the Generic Receive Offload - [GRO] option. It should not match the workload interfaces (usually - named cali...). - type: string bpfDisableUnprivileged: description: 'BPFDisableUnprivileged, if enabled, Felix sets the kernel.unprivileged_bpf_disabled sysctl to disable unprivileged use of BPF. This ensures that unprivileged @@ -103,7 +90,6 @@ spec: with BPF programs regardless of what is the per-interfaces or global setting. Possible values are Disabled, Strict or Loose. [Default: Loose]' - pattern: ^(?i)(Disabled|Strict|Loose)?$ type: string bpfExtToServiceConnmark: description: 'BPFExtToServiceConnmark in BPF mode, control a 32bit @@ -121,18 +107,7 @@ spec: is sent directly from the remote node. In "DSR" mode, the remote node appears to use the IP of the ingress node; this requires a permissive L2 network. [Default: Tunnel]' - pattern: ^(?i)(Tunnel|DSR)?$ - type: string - bpfForceTrackPacketsFromIfaces: - description: 'BPFForceTrackPacketsFromIfaces in BPF mode, forces traffic - from these interfaces to skip Calico''s iptables NOTRACK rule, allowing - traffic from those interfaces to be tracked by Linux conntrack. Should - only be used for interfaces that are not used for the Calico fabric. For - example, a docker bridge device for non-Calico-networked containers. - [Default: docker+]' - items: - type: string - type: array + type: string bpfHostConntrackBypass: description: 'BPFHostConntrackBypass Controls whether to bypass Linux conntrack in BPF mode for workloads and services. [Default: true @@ -153,7 +128,6 @@ spec: minimum time between updates to the dataplane for Felix''s embedded kube-proxy. Lower values give reduced set-up latency. Higher values reduce Felix CPU usage by batching up more work. [Default: 1s]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string bpfL3IfacePattern: description: BPFL3IfacePattern is a regular expression that allows @@ -163,22 +137,11 @@ spec: as any interfaces that handle incoming traffic to nodeports and services from outside the cluster. type: string - bpfLogFilters: - additionalProperties: - type: string - description: "BPFLogFilters is a map of key=values where the value - is a pcap filter expression and the key is an interface name with - 'all' denoting all interfaces, 'weps' all workload endpoints and - 'heps' all host endpoints. \n When specified as an env var, it accepts - a comma-separated list of key=values. [Default: unset - means all - debug logs are emitted]" - type: object bpfLogLevel: description: 'BPFLogLevel controls the log level of the BPF programs when in BPF dataplane mode. One of "Off", "Info", or "Debug". The logs are emitted to the BPF trace pipe, accessible with the command `tc exec bpf debug`. [Default: Off].' - pattern: ^(?i)(Off|Info|Debug)?$ type: string bpfMapSizeConntrack: description: 'BPFMapSizeConntrack sets the size for the conntrack @@ -243,7 +206,6 @@ spec: to append mode, be sure that the other rules in the chains signal acceptance by falling through to the Calico rules, otherwise the Calico policy will be bypassed. [Default: insert]' - pattern: ^(?i)(insert|append)?$ type: string dataplaneDriver: description: DataplaneDriver filename of the external dataplane driver @@ -262,10 +224,8 @@ spec: debugMemoryProfilePath: type: string debugSimulateCalcGraphHangAfter: - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string debugSimulateDataplaneHangAfter: - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string defaultEndpointToHostAction: description: 'DefaultEndpointToHostAction controls what happens to @@ -280,7 +240,6 @@ spec: endpoint egress policy. Use ACCEPT to unconditionally accept packets from workloads after processing workload endpoint egress policy. [Default: Drop]' - pattern: ^(?i)(Drop|Accept|Return)?$ type: string deviceRouteProtocol: description: This defines the route protocol added to programmed device @@ -299,7 +258,6 @@ spec: disableConntrackInvalidCheck: type: boolean endpointReportingDelay: - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string endpointReportingEnabled: type: boolean @@ -367,14 +325,12 @@ spec: based on auto-detected platform capabilities. Values are specified in a comma separated list with no spaces, example; "SNATFullyRandom=true,MASQFullyRandom=false,RestoreSupportsLock=". "true" or "false" will force the feature, empty or omitted values are auto-detected. - pattern: ^([a-zA-Z0-9-_]+=(true|false|),)*([a-zA-Z0-9-_]+=(true|false|))?$ type: string featureGates: description: FeatureGates is used to enable or disable tech-preview Calico features. Values are specified in a comma separated list with no spaces, example; "BPFConnectTimeLoadBalancingWorkaround=enabled,XyZ=false". This is used to enable features that are not fully production ready. - pattern: ^([a-zA-Z0-9-_]+=([^=]+),)*([a-zA-Z0-9-_]+=([^=]+))?$ type: string floatingIPs: description: FloatingIPs configures whether or not Felix will program @@ -436,7 +392,6 @@ spec: description: InterfaceRefreshInterval is the period at which Felix rescans local interfaces to verify their state. The rescan can be disabled by setting the interval to 0. - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string ipipEnabled: description: 'IPIPEnabled overrides whether Felix should configure @@ -452,22 +407,18 @@ spec: all iptables state to ensure that no other process has accidentally broken Calico''s rules. Set to 0 to disable iptables refresh. [Default: 90s]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string iptablesBackend: description: IptablesBackend specifies which backend of iptables will be used. The default is Auto. - pattern: ^(?i)(Auto|FelixConfiguration|FelixConfigurationList|Legacy|NFT)?$ type: string iptablesFilterAllowAction: - pattern: ^(?i)(Accept|Return)?$ type: string iptablesFilterDenyAction: description: IptablesFilterDenyAction controls what happens to traffic that is denied by network policy. By default Calico blocks traffic with an iptables "DROP" action. If you want to use "REJECT" action instead you can configure it in here. - pattern: ^(?i)(Drop|Reject)?$ type: string iptablesLockFilePath: description: 'IptablesLockFilePath is the location of the iptables @@ -480,7 +431,6 @@ spec: wait between attempts to acquire the iptables lock if it is not available. Lower values make Felix more responsive when the lock is contended, but use more CPU. [Default: 50ms]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string iptablesLockTimeout: description: 'IptablesLockTimeout is the time that Felix will wait @@ -489,10 +439,8 @@ spec: also take the lock. When running Felix inside a container, this requires the /run directory of the host to be mounted into the calico/node or calico/felix container. [Default: 0s disabled]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string iptablesMangleAllowAction: - pattern: ^(?i)(Accept|Return)?$ type: string iptablesMarkMask: description: 'IptablesMarkMask is the mask that Felix selects its @@ -509,7 +457,6 @@ spec: back in order to check the write was not clobbered by another process. This should only occur if another application on the system doesn''t respect the iptables lock. [Default: 1s]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string iptablesRefreshInterval: description: 'IptablesRefreshInterval is the period at which Felix @@ -520,7 +467,6 @@ spec: was fixed in kernel version 4.11. If you are using v4.11 or greater you may want to set this to, a higher value to reduce Felix CPU usage. [Default: 10s]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string ipv6Support: description: IPv6Support controls whether Felix enables support for @@ -555,18 +501,15 @@ spec: logSeverityFile: description: 'LogSeverityFile is the log severity above which logs are sent to the log file. [Default: Info]' - pattern: ^(?i)(Debug|Info|Warning|Error|Fatal)?$ type: string logSeverityScreen: description: 'LogSeverityScreen is the log severity above which logs are sent to the stdout. [Default: Info]' - pattern: ^(?i)(Debug|Info|Warning|Error|Fatal)?$ type: string logSeveritySys: description: 'LogSeveritySys is the log severity above which logs are sent to the syslog. Set to None for no logging to syslog. [Default: Info]' - pattern: ^(?i)(Debug|Info|Warning|Error|Fatal)?$ type: string maxIpsetSize: type: integer @@ -605,7 +548,6 @@ spec: pattern: ^.* x-kubernetes-int-or-string: true netlinkTimeout: - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string openstackRegion: description: 'OpenstackRegion is the name of the region that a particular @@ -660,25 +602,21 @@ spec: description: 'ReportingInterval is the interval at which Felix reports its status into the datastore or 0 to disable. Must be non-zero in OpenStack deployments. [Default: 30s]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string reportingTTL: description: 'ReportingTTL is the time-to-live setting for process-wide status reports. [Default: 90s]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string routeRefreshInterval: description: 'RouteRefreshInterval is the period at which Felix re-checks the routes in the dataplane to ensure that no other process has accidentally broken Calico''s rules. Set to 0 to disable route refresh. [Default: 90s]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string routeSource: description: 'RouteSource configures where Felix gets its routing information. - WorkloadIPs: use workload endpoints to construct routes. - CalicoIPAM: the default - use IPAM data to construct routes.' - pattern: ^(?i)(WorkloadIPs|CalicoIPAM)?$ type: string routeSyncDisabled: description: RouteSyncDisabled will disable all operations performed @@ -718,7 +656,6 @@ spec: packets that do not get DNAT''d by kube-proxy. Unless set to "Disabled", in which case such routing loops continue to be allowed. [Default: Drop]' - pattern: ^(?i)(Drop|Reject|Disabled)?$ type: string sidecarAccelerationEnabled: description: 'SidecarAccelerationEnabled enables experimental sidecar @@ -734,12 +671,10 @@ spec: usageReportingInitialDelay: description: 'UsageReportingInitialDelay controls the minimum delay before Felix makes a report. [Default: 300s]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string usageReportingInterval: description: 'UsageReportingInterval controls the interval at which Felix makes reports. [Default: 86400s]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string useInternalDataplaneDriver: description: UseInternalDataplaneDriver, if true, Felix will use its @@ -788,7 +723,6 @@ spec: wireguardKeepAlive: description: 'WireguardKeepAlive controls Wireguard PersistentKeepalive option. Set 0 to disable. [Default: 0]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string wireguardListeningPort: description: 'WireguardListeningPort controls the listening port used @@ -815,7 +749,6 @@ spec: the allowedSourcePrefixes annotation to send traffic with a source IP address that is not theirs. This is disabled by default. When set to "Any", pods can request any prefix. - pattern: ^(?i)(Disabled|Any)?$ type: string xdpEnabled: description: 'XDPEnabled enables XDP acceleration for suitable untracked @@ -826,7 +759,6 @@ spec: all XDP state to ensure that no other process has accidentally broken Calico''s BPF maps or attached programs. Set to 0 to disable XDP refresh. [Default: 90s]' - pattern: ^([0-9]+(\\.[0-9]+)?(ms|s|m|h))*$ type: string type: object type: object diff --git a/pkg/crds/enterprise/crd.projectcalico.org_remoteclusterconfigurations.yaml b/pkg/crds/enterprise/crd.projectcalico.org_remoteclusterconfigurations.yaml index 14345e2392..fe6ce3f896 100644 --- a/pkg/crds/enterprise/crd.projectcalico.org_remoteclusterconfigurations.yaml +++ b/pkg/crds/enterprise/crd.projectcalico.org_remoteclusterconfigurations.yaml @@ -139,26 +139,6 @@ spec: overrides Kubeconfig. This contains the contents that would normally be in the file pointed at by Kubeconfig. type: string - syncOptions: - default: - overlayRoutingMode: Disabled - description: Configuration options that do not relate to the underlying - datastore connection. These fields relate to the syncing of resources - once the connection is established. These fields can be set independent - of the other connection-oriented fields, e.g. they can be set when - ClusterAccessSecret is non-nil. - properties: - overlayRoutingMode: - default: Disabled - description: 'Determines whether overlay routing will be established - between federated clusters. If unspecified during create or - update of RemoteClusterConfiguration, this field will default - based on the encapsulation mode of the local cluster at the - time of RemoteClusterConfiguration application: "Enabled" if - VXLAN, "Disabled" otherwise. If upgrading from a version that - predates this field, this field will default to "Disabled".' - type: string - type: object type: object type: object served: true