Merge pull request #3797 from richardcase/awsmanaged_cluster_is_back

feat: re-introduce awsmanagedcluster

Author: k8s-ci-robot

api/v1beta2/awsmanagedcluster_types.go

@@ -0,0 +1,71 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta2
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+)
+
+// AWSManagedClusterSpec defines the desired state of AWSManagedCluster
+type AWSManagedClusterSpec struct {
+	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
+	// +optional
+	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
+}
+
+// AWSManagedClusterStatus defines the observed state of AWSManagedCluster
+type AWSManagedClusterStatus struct {
+	// Ready is when the AWSManagedControlPlane has a API server URL.
+	// +optional
+	Ready bool `json:"ready,omitempty"`
+
+	// FailureDomains specifies a list fo available availability zones that can be used
+	// +optional
+	FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:path=awsmanagedclusters,scope=Namespaced,categories=cluster-api,shortName=awsmc
+// +kubebuilder:storageversion
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this AWSManagedControl belongs"
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Control plane infrastructure is ready for worker nodes"
+// +kubebuilder:printcolumn:name="Endpoint",type="string",JSONPath=".spec.controlPlaneEndpoint.host",description="API Endpoint",priority=1
+
+// AWSManagedCluster is the Schema for the awsmanagedclusters API
+type AWSManagedCluster struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   AWSManagedClusterSpec   `json:"spec,omitempty"`
+	Status AWSManagedClusterStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// AWSManagedClusterList contains a list of AWSManagedCluster.
+type AWSManagedClusterList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []AWSManagedCluster `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&AWSManagedCluster{}, &AWSManagedClusterList{})
+}

api/v1beta2/zz_generated.deepcopy.go

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
   creationTimestamp: null
   name: awsmanagedclusters.infrastructure.cluster.x-k8s.io
 spec:
@@ -28,80 +28,11 @@ spec:
       jsonPath: .status.ready
       name: Ready
       type: string
-    - description: AWS VPC the control plane is using
-      jsonPath: .spec.networkSpec.vpc.id
-      name: VPC
-      type: string
     - description: API Endpoint
       jsonPath: .spec.controlPlaneEndpoint.host
       name: Endpoint
       priority: 1
       type: string
-    name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: AWSManagedCluster is the Schema for the awsmanagedclusters API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: AWSManagedClusterSpec defines the desired state of AWSManagedCluster
-            properties:
-              controlPlaneEndpoint:
-                description: ControlPlaneEndpoint represents the endpoint used to
-                  communicate with the control plane.
-                properties:
-                  host:
-                    description: The hostname on which the API server is serving.
-                    type: string
-                  port:
-                    description: The port on which the API server is serving.
-                    format: int32
-                    type: integer
-                required:
-                - host
-                - port
-                type: object
-            type: object
-          status:
-            description: AWSManagedClusterStatus defines the observed state of AWSManagedCluster
-            properties:
-              failureDomains:
-                additionalProperties:
-                  description: FailureDomainSpec is the Schema for Cluster API failure
-                    domains. It allows controllers to understand how many failure
-                    domains a cluster can optionally span across.
-                  properties:
-                    attributes:
-                      additionalProperties:
-                        type: string
-                      description: Attributes is a free form map of attributes an
-                        infrastructure provider might use or require.
-                      type: object
-                    controlPlane:
-                      description: ControlPlane determines if this failure domain
-                        is suitable for use by control plane machines.
-                      type: boolean
-                  type: object
-                description: FailureDomains specifies a list fo available availability
-                  zones that can be used
-                type: object
-              ready:
-                description: Ready is when the AWSManagedControlPlane has a API server
-                  URL.
-                type: boolean
-            type: object
-        type: object
     name: v1beta2
     schema:
       openAPIV3Schema:

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedclusters.yaml

@@ -18,6 +18,7 @@ resources:
 - bases/infrastructure.cluster.x-k8s.io_awsclustercontrolleridentities.yaml
 - bases/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml
 - bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml
+- bases/infrastructure.cluster.x-k8s.io_awsmanagedclusters.yaml
 - bases/bootstrap.cluster.x-k8s.io_eksconfigs.yaml
 - bases/bootstrap.cluster.x-k8s.io_eksconfigtemplates.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
@@ -45,6 +46,7 @@ patchesStrategicMerge:
 - patches/cainjection_in_awsclusterroleidentities.yaml
 - patches/cainjection_in_awsclustertemplates.yaml
 - patches/cainjection_in_awsmanagedcontrolplanes.yaml
+- patches/cainjection_in_awsmanagedclusters.yaml
 - patches/cainjection_in_eksconfigs.yaml
 - patches/cainjection_in_eksconfigtemplates.yaml
 # +kubebuilder:scaffold:crdkustomizecainjectionpatch

config/crd/kustomization.yaml

@@ -0,0 +1,8 @@
+# The following patch adds a directive for certmanager to inject CA into the CRD
+# CRD conversion requires k8s 1.13 or later.
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
+  name: awsmanagedclusters.infrastructure.cluster.x-k8s.io

config/crd/patches/cainjection_in_awsmanagedclusters.yaml

@@ -267,6 +267,35 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - awsmanagedclusters
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - awsmanagedclusters
+  - awsmanagedclusters/status
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - awsmanagedclusters/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - infrastructure.cluster.x-k8s.io
   resources: