Merge pull request #1869 from chuckha/dockertypes

✨ Update capd types to be v1a3 compliant

Author: k8s-ci-robot

test/infrastructure/docker/Makefile

@@ -116,7 +116,7 @@ generate-go: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs Go related generate tar
 		object:headerFile=$(ROOT)/hack/boilerplate/boilerplate.generatego.txt \
 		paths=./api/...
 	$(CONVERSION_GEN) \
-		--input-dirs=./api/v1alpha2 \
+		--input-dirs=./api/v1alpha3 \
 		--output-file-base=zz_generated.conversion \
 		--go-header-file=$(ROOT)/hack/boilerplate/boilerplate.generatego.txt
 

test/infrastructure/docker/PROJECT

@@ -3,8 +3,8 @@ domain: cluster.x-k8s.io
 repo: sigs.k8s.io/cluster-api/test/infrastructure/docker
 resources:
 - group: infrastructure
-  version: v1alpha2
+  version: v1alpha3
   kind: DockerCluster
 - group: infrastructure
-  version: v1alpha2
+  version: v1alpha3
   kind: DockerMachine

test/infrastructure/docker/api/v1alpha2/dockercluster_types.go renamed to test/infrastructure/docker/api/v1alpha3/dockercluster_types.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha2
+package v1alpha3
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -30,16 +30,16 @@ const (
 type DockerClusterSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+
+	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
+	// +optional
+	ControlPlaneEndpoint APIEndpoint `json:"controlPlaneEndpoint"`
 }
 
 // DockerClusterStatus defines the observed state of DockerCluster.
 type DockerClusterStatus struct {
 	// Ready denotes that the docker cluster (infrastructure) is ready.
 	Ready bool `json:"ready"`
-
-	// APIEndpoints represents the endpoints to communicate with the control plane.
-	// +optional
-	APIEndpoints []APIEndpoint `json:"apiEndpoints,omitempty"`
 }
 
 // APIEndpoint represents a reachable Kubernetes API endpoint.

test/infrastructure/docker/api/v1alpha2/dockermachine_types.go renamed to test/infrastructure/docker/api/v1alpha3/dockermachine_types.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha2
+package v1alpha3
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

test/infrastructure/docker/api/v1alpha2/dockermachinetemplate_types.go renamed to test/infrastructure/docker/api/v1alpha3/dockermachinetemplate_types.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha2
+package v1alpha3
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

test/infrastructure/docker/api/v1alpha2/groupversion_info.go renamed to test/infrastructure/docker/api/v1alpha3/groupversion_info.go

@@ -17,7 +17,7 @@ limitations under the License.
 // Package v1alpha2 contains API Schema definitions for the infrastructure v1alpha2 API group
 // +kubebuilder:object:generate=true
 // +groupName=infrastructure.cluster.x-k8s.io
-package v1alpha2
+package v1alpha3
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha2"}
+	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha3"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

test/infrastructure/docker/api/v1alpha2/zz_generated.deepcopy.go renamed to test/infrastructure/docker/api/v1alpha3/zz_generated.deepcopy.go

@@ -38,27 +38,25 @@ spec:
           type: object
         spec:
           description: DockerClusterSpec defines the desired state of DockerCluster.
+          properties:
+            controlPlaneEndpoint:
+              description: ControlPlaneEndpoint represents the endpoint used to communicate
+                with the control plane.
+              properties:
+                host:
+                  description: Host is the hostname on which the API server is serving.
+                  type: string
+                port:
+                  description: Port is the port on which the API server is serving.
+                  type: integer
+              required:
+              - host
+              - port
+              type: object
           type: object
         status:
           description: DockerClusterStatus defines the observed state of DockerCluster.
           properties:
-            apiEndpoints:
-              description: APIEndpoints represents the endpoints to communicate with
-                the control plane.
-              items:
-                description: APIEndpoint represents a reachable Kubernetes API endpoint.
-                properties:
-                  host:
-                    description: Host is the hostname on which the API server is serving.
-                    type: string
-                  port:
-                    description: Port is the port on which the API server is serving.
-                    type: integer
-                required:
-                - host
-                - port
-                type: object
-              type: array
             ready:
               description: Ready denotes that the docker cluster (infrastructure)
                 is ready.
@@ -67,9 +65,9 @@ spec:
           - ready
           type: object
       type: object
-  version: v1alpha2
+  version: v1alpha3
   versions:
-  - name: v1alpha2
+  - name: v1alpha3
     served: true
     storage: true
 status:

test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml

@@ -58,9 +58,9 @@ spec:
           - ready
           type: object
       type: object
-  version: v1alpha2
+  version: v1alpha3
   versions:
-  - name: v1alpha2
+  - name: v1alpha3
     served: true
     storage: true
 status:

test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml

@@ -62,9 +62,9 @@ spec:
           - template
           type: object
       type: object
-  version: v1alpha2
+  version: v1alpha3
   versions:
-  - name: v1alpha2
+  - name: v1alpha3
     served: true
     storage: true
 status:

test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinetemplates.yaml

@@ -23,7 +23,7 @@ import (
 	"github.com/pkg/errors"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
-	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha2"
+	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/test/infrastructure/docker/docker"
 	"sigs.k8s.io/cluster-api/test/infrastructure/docker/third_party/forked/loadbalancer"
 	"sigs.k8s.io/cluster-api/util"
@@ -122,11 +122,9 @@ func reconcileNormal(dockerCluster *infrav1.DockerCluster, externalLoadBalancer
 		return ctrl.Result{}, errors.Wrap(err, "failed to get ip for the load balancer")
 	}
 
-	dockerCluster.Status.APIEndpoints = []infrav1.APIEndpoint{
-		{
-			Host: lbip4,
-			Port: loadbalancer.ControlPlanePort,
-		},
+	dockerCluster.Spec.ControlPlaneEndpoint = infrav1.APIEndpoint{
+		Host: lbip4,
+		Port: loadbalancer.ControlPlanePort,
 	}
 
 	// Mark the dockerCluster ready

test/infrastructure/docker/controllers/dockercluster_controller.go

@@ -25,7 +25,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
-	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha2"
+	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/test/infrastructure/docker/docker"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/patch"

test/infrastructure/docker/controllers/dockermachine_controller.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/klog"
 	"k8s.io/klog/klogr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
-	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha2"
+	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 )

test/infrastructure/docker/controllers/dockermachine_controller_test.go

@@ -32,7 +32,7 @@ import (
 
 	capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
-	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha2"
+	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3"
 )
 
 func TestDocker(t *testing.T) {

test/infrastructure/docker/e2e/docker_suite_test.go

@@ -31,7 +31,7 @@ import (
 
 	capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
-	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha2"
+	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3"
 )
 
 var _ = Describe("Docker", func() {

test/infrastructure/docker/e2e/docker_test.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/klog"
 	"k8s.io/klog/klogr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
-	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha2"
+	infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/test/infrastructure/docker/controllers"
 	ctrl "sigs.k8s.io/controller-runtime"
 	// +kubebuilder:scaffold:imports