Create CRDs V1

.golangci.yml

@@ -66,6 +66,8 @@ issues:
       text: 'ifElseChain: rewrite if\-else to switch statement'
     - path: pkg/apis/elasticsearch/v1beta1/fields\.go
       text: 'const .* should be'
+    - path: pkg/apis/elasticsearch/v1/fields\.go
+      text: 'const .* should be'
     - path: pkg/controller/elasticsearch/user/reconciler\.go
       text: 'Consider preallocating `allUsers`'
     - path: pkg/controller/elasticsearch/user/user\.go
@@ -92,6 +94,8 @@ issues:
       text: 'G101: Potential hardcoded credentials'
     - path: pkg/apis/elasticsearch/v1beta1/name\.go
       text: 'G101: Potential hardcoded credentials'
+    - path: pkg/apis/elasticsearch/v1/name\.go
+      text: 'G101: Potential hardcoded credentials'
     - path: pkg/controller/elasticsearch/driver/version\.go
       text: 'Consider preallocating `vs`'
     - linters:

cmd/manager/main.go

@@ -17,10 +17,20 @@ import (
 	// allow gcp authentication
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"k8s.io/client-go/kubernetes"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
+	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+
 	"github.com/elastic/cloud-on-k8s/pkg/about"
-	apmtype "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1beta1"
-	estype "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1beta1"
-	kibanatype "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1beta1"
+	apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1"
+	esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1"
+	kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/apmserver"
 	asesassn "github.com/elastic/cloud-on-k8s/pkg/controller/apmserverelasticsearchassociation"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/common/association"
@@ -36,15 +46,6 @@ import (
 	"github.com/elastic/cloud-on-k8s/pkg/dev"
 	"github.com/elastic/cloud-on-k8s/pkg/dev/portforward"
 	"github.com/elastic/cloud-on-k8s/pkg/utils/net"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"k8s.io/client-go/kubernetes"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/manager"
-	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 )
 
 const (
@@ -349,8 +350,8 @@ func garbageCollectUsers(cfg *rest.Config, managedNamespaces []string) {
 		os.Exit(1)
 	}
 	err = ugc.
-		For(&apmtype.ApmServerList{}, asesassn.AssociationLabelNamespace, asesassn.AssociationLabelName).
-		For(&kibanatype.KibanaList{}, kbassn.AssociationLabelNamespace, kbassn.AssociationLabelName).
+		For(&apmv1.ApmServerList{}, asesassn.AssociationLabelNamespace, asesassn.AssociationLabelName).
+		For(&kbv1.KibanaList{}, kbassn.AssociationLabelNamespace, kbassn.AssociationLabelName).
 		DoGarbageCollection()
 	if err != nil {
 		log.Error(err, "user garbage collector failed")
@@ -382,7 +383,7 @@ func setupWebhook(mgr manager.Manager, certRotation certificates.RotationParams,
 		}
 	}
 
-	if err := (&estype.Elasticsearch{}).SetupWebhookWithManager(mgr); err != nil {
+	if err := (&esv1.Elasticsearch{}).SetupWebhookWithManager(mgr); err != nil {
 		log.Error(err, "unable to create webhook", "webhook", "Elasticsearch")
 		os.Exit(1)
 	}

config/crds/all-crds.yaml

@@ -375,11 +375,14 @@ spec:
                 connect to.
               type: string
           type: object
-  version: v1beta1
+  version: v1
   versions:
-  - name: v1beta1
+  - name: v1
     served: true
     storage: true
+  - name: v1beta1
+    served: true
+    storage: false
   - name: v1alpha1
     served: false
     storage: false
@@ -1084,11 +1087,14 @@ spec:
                 is in from the controller point of view.
               type: string
           type: object
-  version: v1beta1
+  version: v1
   versions:
-  - name: v1beta1
+  - name: v1
     served: true
     storage: true
+  - name: v1beta1
+    served: true
+    storage: false
   - name: v1alpha1
     served: false
     storage: false
@@ -1465,11 +1471,14 @@ spec:
               description: KibanaHealth expresses the status of the Kibana instances.
               type: string
           type: object
-  version: v1beta1
+  version: v1
   versions:
-  - name: v1beta1
+  - name: v1
     served: true
     storage: true
+  - name: v1beta1
+    served: true
+    storage: false
   - name: v1alpha1
     served: false
     storage: false

config/crds/bases/apm.k8s.elastic.co_apmservers.yaml

@@ -4566,11 +4566,14 @@ spec:
               type: string
           type: object
       type: object
-  version: v1beta1
+  version: v1
   versions:
-  - name: v1beta1
+  - name: v1
     served: true
     storage: true
+  - name: v1beta1
+    served: true
+    storage: false
 status:
   acceptedNames:
     kind: ""

config/crds/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml

@@ -5181,11 +5181,14 @@ spec:
               type: string
           type: object
       type: object
-  version: v1beta1
+  version: v1
   versions:
-  - name: v1beta1
+  - name: v1
     served: true
     storage: true
+  - name: v1beta1
+    served: true
+    storage: false
 status:
   acceptedNames:
     kind: ""

config/crds/bases/kibana.k8s.elastic.co_kibanas.yaml

@@ -4555,11 +4555,14 @@ spec:
               type: string
           type: object
       type: object
-  version: v1beta1
+  version: v1
   versions:
-  - name: v1beta1
+  - name: v1
     served: true
     storage: true
+  - name: v1beta1
+    served: true
+    storage: false
 status:
   acceptedNames:
     kind: ""

config/e2e/global_operator.yaml

@@ -225,6 +225,25 @@ webhooks:
           - UPDATE
         resources:
           - elasticsearches
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: elastic-webhook-server
+        namespace: {{ .GlobalOperator.Namespace }}
+        # this is the path controller-runtime automatically generates
+        path: /validate-elasticsearch-k8s-elastic-co-v1-elasticsearch
+    failurePolicy: Ignore
+    name: elastic-es-validation.k8s.elastic.co
+    rules:
+      - apiGroups:
+          - elasticsearch.k8s.elastic.co
+        apiVersions:
+          - v1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - elasticsearches
 ---
 apiVersion: v1
 kind: Service

config/operator/global/webhook.template.yaml

@@ -3,6 +3,25 @@ kind: ValidatingWebhookConfiguration
 metadata:
   name: elastic-webhook.k8s.elastic.co
 webhooks:
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: elastic-webhook-server
+        namespace: <NAMESPACE>
+        # this is the path controller-runtime automatically generates
+        path: /validate-elasticsearch-k8s-elastic-co-v1-elasticsearch
+    failurePolicy: Ignore
+    name: elastic-es-validation.k8s.elastic.co
+    rules:
+      - apiGroups:
+          - elasticsearch.k8s.elastic.co
+        apiVersions:
+          - v1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - elasticsearches
   - clientConfig:
       caBundle: Cg==
       service:

config/recipes/beats/1_monitor.yaml

@@ -1,5 +1,5 @@
 # This sample sets up an Elasticsearch cluster and a Kibana instance preconfigured for that cluster
-apiVersion: elasticsearch.k8s.elastic.co/v1beta1
+apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: monitor
@@ -24,7 +24,7 @@ spec:
           requests:
             storage: 50Gi
 ---
-apiVersion: kibana.k8s.elastic.co/v1beta1
+apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: monitor

config/samples/apm/apm_es_kibana.yaml

@@ -1,6 +1,6 @@
 # This sample sets up a an Elasticsearch cluster along with a Kibana instance
 # and an APM server, configured to be able to communicate with each other
-apiVersion: elasticsearch.k8s.elastic.co/v1beta1
+apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: es-apm-sample
@@ -14,7 +14,7 @@ spec:
       # See: https://www.elastic.co/guide/en/cloud-on-k8s/master/k8s-virtual-memory.html
       node.store.allow_mmap: false
 ---
-apiVersion: apm.k8s.elastic.co/v1beta1
+apiVersion: apm.k8s.elastic.co/v1
 kind: ApmServer
 metadata:
   name: apm-apm-sample
@@ -24,7 +24,7 @@ spec:
   elasticsearchRef:
     name: "es-apm-sample"
 ---
-apiVersion: kibana.k8s.elastic.co/v1beta1
+apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: kb-apm-sample

config/samples/apm/apmserver.yaml

@@ -1,4 +1,4 @@
-apiVersion: apm.k8s.elastic.co/v1beta1
+apiVersion: apm.k8s.elastic.co/v1
 kind: ApmServer
 metadata:
   name: apmserver-sample

config/samples/elasticsearch/elasticsearch.yaml

@@ -1,5 +1,5 @@
 # This sample sets up an Elasticsearch cluster with 3 nodes.
-apiVersion: elasticsearch.k8s.elastic.co/v1beta1
+apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elasticsearch-sample

config/samples/kibana/kibana_es.yaml

@@ -1,5 +1,5 @@
 # This sample sets up an Elasticsearch cluster and a Kibana instance preconfigured for that cluster
-apiVersion: elasticsearch.k8s.elastic.co/v1beta1
+apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elasticsearch-sample
@@ -13,7 +13,7 @@ spec:
       # See: https://www.elastic.co/guide/en/cloud-on-k8s/master/k8s-virtual-memory.html
       node.store.allow_mmap: false
 ---
-apiVersion: kibana.k8s.elastic.co/v1beta1
+apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: kibana-sample

config/webhook/manifests.yaml

@@ -11,7 +11,25 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-elasticsearch
+      path: /validate-elasticsearch-k8s-elastic-co-v1-elasticsearch
+  failurePolicy: Ignore
+  name: elastic-es-validation.k8s.elastic.co
+  rules:
+  - apiGroups:
+    - elasticsearch.k8s.elastic.co
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - elasticsearches
+- clientConfig:
+    caBundle: Cg==
+    service:
+      name: webhook-service
+      namespace: system
+      path: /validate-elasticsearch-k8s-elastic-co-v1beta1-elasticsearch
   failurePolicy: Ignore
   name: elastic-es-validation.k8s.elastic.co
   rules: