feat: Add package registry to eck

Makefile

@@ -425,7 +425,7 @@ E2E_STACK_VERSION          ?= 9.1.2
 # regexp to filter tests to run
 export TESTS_MATCH         ?= "^Test"
 export E2E_JSON            ?= false
-TEST_TIMEOUT               ?= 15m
+TEST_TIMEOUT               ?= 20m
 E2E_SKIP_CLEANUP           ?= false
 E2E_DEPLOY_CHAOS_JOB       ?= false
 # go build constraints potentially restricting the tests to run

cmd/manager/main.go

@@ -53,6 +53,7 @@ import (
 	kbv1beta1 "github.com/elastic/cloud-on-k8s/v3/pkg/apis/kibana/v1beta1"
 	logstashv1alpha1 "github.com/elastic/cloud-on-k8s/v3/pkg/apis/logstash/v1alpha1"
 	emsv1alpha1 "github.com/elastic/cloud-on-k8s/v3/pkg/apis/maps/v1alpha1"
+	eprv1alpha1 "github.com/elastic/cloud-on-k8s/v3/pkg/apis/packageregistry/v1alpha1"
 	policyv1alpha1 "github.com/elastic/cloud-on-k8s/v3/pkg/apis/stackconfigpolicy/v1alpha1"
 	"github.com/elastic/cloud-on-k8s/v3/pkg/controller/agent"
 	"github.com/elastic/cloud-on-k8s/v3/pkg/controller/apmserver"
@@ -84,6 +85,7 @@ import (
 	"github.com/elastic/cloud-on-k8s/v3/pkg/controller/logstash"
 	lsvalidation "github.com/elastic/cloud-on-k8s/v3/pkg/controller/logstash/validation"
 	"github.com/elastic/cloud-on-k8s/v3/pkg/controller/maps"
+	"github.com/elastic/cloud-on-k8s/v3/pkg/controller/packageregistry"
 	"github.com/elastic/cloud-on-k8s/v3/pkg/controller/remotecluster"
 	"github.com/elastic/cloud-on-k8s/v3/pkg/controller/stackconfigpolicy"
 	"github.com/elastic/cloud-on-k8s/v3/pkg/controller/webhook"
@@ -914,6 +916,7 @@ func registerControllers(mgr manager.Manager, params operator.Parameters, access
 		{name: "LicenseTrial", registerFunc: licensetrial.Add},
 		{name: "Agent", registerFunc: agent.Add},
 		{name: "Maps", registerFunc: maps.Add},
+		{name: "PackageRegistry", registerFunc: packageregistry.Add},
 		{name: "StackConfigPolicy", registerFunc: stackconfigpolicy.Add},
 		{name: "Logstash", registerFunc: logstash.Add},
 	}
@@ -934,6 +937,7 @@ func registerControllers(mgr manager.Manager, params operator.Parameters, access
 		{name: "APM-KB", registerFunc: associationctl.AddApmKibana},
 		{name: "KB-ES", registerFunc: associationctl.AddKibanaES},
 		{name: "KB-ENT", registerFunc: associationctl.AddKibanaEnt},
+		{name: "KB-EPR", registerFunc: associationctl.AddKibanaEPR},
 		{name: "ENT-ES", registerFunc: associationctl.AddEntES},
 		{name: "BEAT-ES", registerFunc: associationctl.AddBeatES},
 		{name: "BEAT-KB", registerFunc: associationctl.AddBeatKibana},
@@ -993,6 +997,7 @@ func garbageCollectSoftOwnedSecrets(ctx context.Context, k8sClient k8s.Client) {
 		beatv1beta1.Kind:      &beatv1beta1.Beat{},
 		agentv1alpha1.Kind:    &agentv1alpha1.Agent{},
 		emsv1alpha1.Kind:      &emsv1alpha1.ElasticMapsServer{},
+		eprv1alpha1.Kind:      &eprv1alpha1.PackageRegistry{},
 		policyv1alpha1.Kind:   &policyv1alpha1.StackConfigPolicy{},
 		logstashv1alpha1.Kind: &logstashv1alpha1.Logstash{},
 	}); err != nil {
@@ -1037,6 +1042,7 @@ func setupWebhook(
 		&kbv1.Kibana{},
 		&kbv1beta1.Kibana{},
 		&emsv1alpha1.ElasticMapsServer{},
+		&eprv1alpha1.PackageRegistry{},
 		&policyv1alpha1.StackConfigPolicy{},
 	}
 	for _, obj := range webhookObjects {

config/crds/v1/patches/kustomization.yaml

@@ -77,5 +77,12 @@ patches:
       kind: CustomResourceDefinition
       name: logstashes.logstash.k8s.elastic.co
     path: logstash-patches.yaml
+  # custom patches for PackageRegistry
+  - target:
+      group: apiextensions.k8s.io
+      version: v1
+      kind: CustomResourceDefinition
+      name: packageregistries.packageregistry.k8s.elastic.co
+    path: packageregistry-patches.yaml
 
 

config/crds/v1/patches/packageregistry-patches.yaml

@@ -0,0 +1,7 @@
+# Using `kubectl apply` stores the complete CRD file as an annotation,
+# which may be too big for the annotations size limit.
+# One way to mitigate this problem is to remove the (huge) podTemplate properties from the CRD.
+# It also avoids the problem of having any k8s-version specific field in the Pod schema,
+# that would maybe not match the user's k8s version.
+- op: remove
+  path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/podTemplate/properties

config/crds/v1/resources/kibana.k8s.elastic.co_kibanas.yaml

@@ -639,6 +639,37 @@ spec:
                         type: array
                     type: object
                 type: object
+              packageRegistryRef:
+                description: PackageRegistryRef is a reference to an Elastic Package
+                  Registry running in the same Kubernetes cluster.
+                properties:
+                  name:
+                    description: Name of an existing Kubernetes object corresponding
+                      to an Elastic resource managed by ECK.
+                    type: string
+                  namespace:
+                    description: Namespace of the Kubernetes object. If empty, defaults
+                      to the current namespace.
+                    type: string
+                  secretName:
+                    description: |-
+                      SecretName is the name of an existing Kubernetes secret that contains connection information for associating an
+                      Elastic resource not managed by the operator.
+                      The referenced secret must contain the following:
+                      - `url`: the URL to reach the Elastic resource
+                      - `username`: the username of the user to be authenticated to the Elastic resource
+                      - `password`: the password of the user to be authenticated to the Elastic resource
+                      - `ca.crt`: the CA certificate in PEM format (optional)
+                      - `api-key`: the key to authenticate against the Elastic resource instead of a username and password (supported only for `elasticsearchRefs` in AgentSpec and in BeatSpec)
+                      This field cannot be used in combination with the other fields name, namespace or serviceName.
+                    type: string
+                  serviceName:
+                    description: |-
+                      ServiceName is the name of an existing Kubernetes service which is used to make requests to the referenced
+                      object. It has to be in the same namespace as the referenced resource. If left empty, the default HTTP service of
+                      the referenced resource is used.
+                    type: string
+                type: object
               podTemplate:
                 description: PodTemplate provides customisation options (labels, annotations,
                   affinity rules, resource requests, and so on) for the Kibana pods
@@ -9183,6 +9214,10 @@ spec:
                   controller has not yet processed the changes contained in the Kibana specification.
                 format: int64
                 type: integer
+              packageRegistryAssociationStatus:
+                description: PackageRegistryAssociationStatus is the status of any
+                  auto-linking to Elastic Package Registry.
+                type: string
               selector:
                 description: Selector is the label selector used to find all pods.
                 type: string

config/crds/v1/resources/kustomization.yaml

@@ -7,5 +7,6 @@ resources:
   - beat.k8s.elastic.co_beats.yaml
   - agent.k8s.elastic.co_agents.yaml
   - maps.k8s.elastic.co_elasticmapsservers.yaml
+  - packageregistry.k8s.elastic.co_packageregistries.yaml
   - stackconfigpolicy.k8s.elastic.co_stackconfigpolicies.yaml
   - logstash.k8s.elastic.co_logstashes.yaml