Fold enterprise components into the calico mono-image

config/enterprise_versions.yml

@@ -6,9 +6,6 @@ components:
   manager:
     image: manager
     version: master
-  voltron:
-    image: voltron
-    version: master
   calico:
     image: calico
     version: master
@@ -24,15 +21,6 @@ components:
   fluentd-windows:
     image: fluentd-windows
     version: master
-  ui-apis:
-    image: ui-apis
-    version: master
-  linseed:
-    image: linseed
-    version: master
-  es-gateway:
-    image: es-gateway
-    version: master
   dex:
     image: dex
     version: master
@@ -57,39 +45,12 @@ components:
   intrusion-detection-controller:
     image: intrusion-detection-controller
     version: master
-  waf-http-filter:
-    image: waf-http-filter
-    version: master
-  webhooks-processor:
-    image: webhooks-processor
-    version: master
-  compliance-controller:
-    image: compliance-controller
-    version: master
-  compliance-reporter:
-    image: compliance-reporter
-    version: master
-  compliance-snapshotter:
-    image: compliance-snapshotter
-    version: master
-  compliance-server:
-    image: compliance-server
-    version: master
   compliance-benchmarker:
     image: compliance-benchmarker
     version: master
   tigera-cni-windows:
     image: cni-windows
     version: master
-  elasticsearch-metrics:
-    image: elasticsearch-metrics
-    version: master
-  packetcapture:
-    image: packetcapture
-    version: master
-  policy-recommendation:
-    image: policy-recommendation
-    version: master
   # coreos-prometheus holds the version of prometheus built for tigera/prometheus,
   # which prometheus operator uses to validate.
   coreos-prometheus:
@@ -104,9 +65,6 @@ components:
   alertmanager:
     image: alertmanager
     version: master
-  tigera-prometheus-service:
-    image: prometheus-service
-    version: master
   deep-packet-inspection:
     image: deep-packet-inspection
     version: master
@@ -117,9 +75,6 @@ components:
   # Elasticsearch
   eck-elasticsearch-operator:
     version: 2.16.0
-  l7-collector:
-    image: l7-collector
-    version: master
   gateway-l7-collector:
     image: gateway-l7-collector
     version: master
@@ -129,12 +84,6 @@ components:
   dikastes:
     image: dikastes
     version: master
-  queryserver:
-    image: queryserver
-    version: master
-  l7-admission-controller:
-    image: l7-admission-controller
-    version: master
   egress-gateway:
     image: egress-gateway
     version: master

hack/gen-versions/enterprise.go.tpl

@@ -37,42 +37,6 @@ var (
 		variant:   enterpriseVariant,
 	}
 {{- end }}
-{{ with index .Components "compliance-controller" }}
-	ComponentComplianceController = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
-{{ with index .Components "compliance-reporter" }}
-	ComponentComplianceReporter = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
-{{ with index .Components "compliance-server" }}
-	ComponentComplianceServer = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
-{{ with index .Components "compliance-snapshotter" }}
-	ComponentComplianceSnapshotter = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
 {{ with index .Components "deep-packet-inspection" }}
 	ComponentDeepPacketInspection = Component{
 		Version:   "{{ .Version }}",
@@ -127,33 +91,6 @@ var (
 		variant:   enterpriseVariant,
 	}
 {{- end }}
-{{ with index .Components "ui-apis" }}
-	ComponentUIAPIs = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
-{{ with index .Components "es-gateway" }}
-	ComponentESGateway = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
-{{ with index .Components "linseed" }}
-	ComponentLinseed = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
 {{ with .Components.fluentd }}
 	ComponentFluentd = Component{
 		Version:   "{{ .Version }}",
@@ -181,24 +118,6 @@ var (
 		variant:   enterpriseVariant,
 	}
 {{- end }}
-{{ with index .Components "waf-http-filter" }}
-	ComponentWAFHTTPFilter = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
-{{ with index .Components "webhooks-processor" }}
-	ComponentSecurityEventWebhooksProcessor = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
 {{ with .Components.kibana }}
 	ComponentKibana = Component{
 		Version:   "{{ .Version }}",
@@ -226,33 +145,6 @@ var (
 		variant:   enterpriseVariant,
 	}
 {{- end }}
-{{ with .Components.voltron }}
-	ComponentManagerProxy = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
-{{ with index .Components "packetcapture" }}
-	ComponentPacketCapture = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
-{{ with index .Components "policy-recommendation" }}
-	ComponentPolicyRecommendation = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
 {{ with index .Components "egress-gateway" }}
 	ComponentEgressGateway = Component{
 		Version:   "{{ .Version }}",
@@ -262,15 +154,6 @@ var (
 		variant:   enterpriseVariant,
 	}
 {{- end }}
-{{ with index .Components "l7-collector" }}
-	ComponentL7Collector = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
 {{ with index .Components "gateway-l7-collector" }}
 	ComponentGatewayL7Collector = Component{
 		Version:  "{{ .Version }}",
@@ -297,24 +180,6 @@ var (
 		variant:   enterpriseVariant,
 	}
 {{- end }}
-{{ with index .Components "queryserver" }}
-	ComponentQueryServer = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
-{{ with index .Components "l7-admission-controller" }}
-	ComponentL7AdmissionController = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
 {{ with index .Components "coreos-prometheus" }}
 	ComponentCoreOSPrometheus = Component{
 		Version: "{{ .Version }}",
@@ -330,15 +195,6 @@ var (
 		variant:   enterpriseVariant,
 	}
 {{- end }}
-{{ with index .Components "tigera-prometheus-service" }}
-	ComponentTigeraPrometheusService = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
 {{ with index .Components "coreos-alertmanager" }}
 	ComponentCoreOSAlertmanager = Component{
 		Version: "{{ .Version }}",
@@ -381,15 +237,6 @@ var (
 		variant:   enterpriseVariant,
 	}
 {{- end }}
-{{ with index .Components "elasticsearch-metrics" }}
-	ComponentElasticsearchMetrics = Component{
-		Version:   "{{ .Version }}",
-		Image:     "{{ .Image }}",
-		Registry:  "{{ .Registry }}",
-		imagePath: "{{ .ImagePath }}",
-		variant:   enterpriseVariant,
-	}
-{{- end }}
 {{ with index .Components "gateway-api-envoy-gateway" }}
 	ComponentGatewayAPIEnvoyGateway = Component{
 		Version:   "{{ .Version }}",
@@ -455,42 +302,25 @@ var (
 	EnterpriseImages = []Component{
 		ComponentTigeraCalico,
 		ComponentComplianceBenchmarker,
-		ComponentComplianceController,
-		ComponentComplianceReporter,
-		ComponentComplianceServer,
-		ComponentComplianceSnapshotter,
 		ComponentDeepPacketInspection,
 		ComponentElasticTseeInstaller,
 		ComponentElasticsearch,
 		ComponentElasticsearchOperator,
-		ComponentUIAPIs,
 		ComponentFluentd,
 		ComponentFluentdWindows,
 		ComponentIntrusionDetectionController,
-		ComponentWAFHTTPFilter,
-		ComponentSecurityEventWebhooksProcessor,
 		ComponentKibana,
 		ComponentManager,
 		ComponentDex,
-		ComponentManagerProxy,
-		ComponentPacketCapture,
-		ComponentPolicyRecommendation,
 		ComponentEgressGateway,
-		ComponentL7Collector,
 		ComponentGatewayL7Collector,
 		ComponentEnvoyProxy,
 		ComponentDikastes,
-		ComponentQueryServer,
 		ComponentPrometheus,
-		ComponentTigeraPrometheusService,
 		ComponentPrometheusAlertmanager,
 		ComponentTigeraNode,
 		ComponentTigeraNodeWindows,
 		ComponentTigeraCNIWindows,
-		ComponentElasticsearchMetrics,
-		ComponentESGateway,
-		ComponentLinseed,
-		ComponentL7AdmissionController,
 		ComponentGatewayAPIEnvoyGateway,
 		ComponentGatewayAPIEnvoyProxy,
 		ComponentGatewayAPIEnvoyRatelimit,