Move to v1alpha2 to match Cluster API

dippynark · Jan 7, 2020 · e6b63f5 · e6b63f5
1 parent a78b851
commit e6b63f5
Show file tree

Hide file tree

Showing 20 changed files with 39 additions and 40 deletions.
diff --git a/PROJECT b/PROJECT
@@ -3,11 +3,11 @@ repo: github.com/dippynark/cluster-api-provider-kubernetes
 resources:
 - group: infrastructure
   kind: KubernetesCluster
-  version: v1alpha1
+  version: v1alpha2
 - group: infrastructure
   kind: KubernetesMachine
-  version: v1alpha1
+  version: v1alpha2
 - group: infrastructure
   kind: KubernetesMachineTemplate
-  version: v1alpha1
+  version: v1alpha2
 version: "2"
diff --git a/README.md b/README.md
@@ -50,12 +50,12 @@ kubectl apply -f https://github.com/kubernetes-sigs/cluster-api/releases/downloa
 kubectl apply -f https://github.com/kubernetes-sigs/cluster-api-bootstrap-provider-kubeadm/releases/download/v0.1.5/bootstrap-components.yaml
 
 # Install kubernetes infrastructure provider
-kubectl apply -f https://github.com/dippynark/cluster-api-provider-kubernetes/releases/download/v0.1.3/provider-components.yaml
+kubectl apply -f https://github.com/dippynark/cluster-api-provider-kubernetes/releases/download/v0.2.0/provider-components.yaml
 
 # Allow cluster api controller to interact with kubernetes infrastructure resources
 # If the kubernetes provider were SIG-sponsored this would not be necesarry ;)
 # https://cluster-api.sigs.k8s.io/providers/v1alpha1-to-v1alpha2.html#the-new-api-groups
-kubectl apply -f https://github.com/dippynark/cluster-api-provider-kubernetes/releases/download/v0.1.3/capi-kubernetes-rbac.yaml
+kubectl apply -f https://github.com/dippynark/cluster-api-provider-kubernetes/releases/download/v0.2.0/capi-kubernetes-rbac.yaml
 ```
 
 ### Configuration
@@ -64,7 +64,7 @@ kubectl apply -f https://github.com/dippynark/cluster-api-provider-kubernetes/re
 # Apply cluster infrastructure
 kubectl apply -f <(cat <<EOF
 kind: KubernetesCluster
-apiVersion: infrastructure.lukeaddison.co.uk/v1alpha1
+apiVersion: infrastructure.lukeaddison.co.uk/v1alpha2
 metadata:
   name: example
 spec:
@@ -84,7 +84,7 @@ spec:
     serviceDomain: "cluster.local"
   infrastructureRef:
     kind: KubernetesCluster
-    apiVersion: infrastructure.lukeaddison.co.uk/v1alpha1
+    apiVersion: infrastructure.lukeaddison.co.uk/v1alpha2
     name: example
 EOF
 )
@@ -108,7 +108,7 @@ spec:
         enable-hostpath-provisioner: "true"
 ---
 kind: KubernetesMachine
-apiVersion: infrastructure.lukeaddison.co.uk/v1alpha1
+apiVersion: infrastructure.lukeaddison.co.uk/v1alpha2
 metadata:
   name: controller
 ---
@@ -128,15 +128,15 @@ spec:
       name: controller
   infrastructureRef:
     kind: KubernetesMachine
-    apiVersion: infrastructure.lukeaddison.co.uk/v1alpha1
+    apiVersion: infrastructure.lukeaddison.co.uk/v1alpha2
     name: controller
 EOF
 )
 
 # Deploy worker machine deployment
 kubectl apply -f <(cat <<EOF
 kind: KubernetesMachineTemplate
-apiVersion: infrastructure.lukeaddison.co.uk/v1alpha1
+apiVersion: infrastructure.lukeaddison.co.uk/v1alpha2
 metadata:
   name: worker
 spec:
@@ -184,7 +184,7 @@ spec:
           name: worker
       infrastructureRef:
         kind: KubernetesMachineTemplate
-        apiVersion: infrastructure.lukeaddison.co.uk/v1alpha1
+        apiVersion: infrastructure.lukeaddison.co.uk/v1alpha2
         name: worker
 EOF
 )

diff --git a/api/v1alpha1/groupversion_info.go → api/v1alpha2/groupversion_info.go b/api/v1alpha1/groupversion_info.go → api/v1alpha2/groupversion_info.go
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha1 contains API Schema definitions for the infrastructure v1alpha1 API group
+// Package v1alpha2 contains API Schema definitions for the infrastructure v1alpha2 API group
 // +kubebuilder:object:generate=true
 // +groupName=infrastructure.lukeaddison.co.uk
-package v1alpha1
+package v1alpha2
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -27,7 +27,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "infrastructure.lukeaddison.co.uk", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "infrastructure.lukeaddison.co.uk", Version: "v1alpha2"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/api/v1alpha1/kubernetescluster_types.go → api/v1alpha2/kubernetescluster_types.go b/api/v1alpha1/kubernetescluster_types.go → api/v1alpha2/kubernetescluster_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1alpha2
 
 import (
 	corev1 "k8s.io/api/core/v1"

diff --git a/api/v1alpha1/kubernetesmachine_types.go → api/v1alpha2/kubernetesmachine_types.go b/api/v1alpha1/kubernetesmachine_types.go → api/v1alpha2/kubernetesmachine_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1alpha2
 
 import (
 	corev1 "k8s.io/api/core/v1"

diff --git a/...alpha1/kubernetesmachinetemplate_types.go → ...alpha2/kubernetesmachinetemplate_types.go b/...alpha1/kubernetesmachinetemplate_types.go → ...alpha2/kubernetesmachinetemplate_types.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1alpha2
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/api/v1alpha1/zz_generated.deepcopy.go → api/v1alpha2/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go → api/v1alpha2/zz_generated.deepcopy.go
diff --git a/config/crd/bases/infrastructure.lukeaddison.co.uk_kubernetesclusters.yaml b/config/crd/bases/infrastructure.lukeaddison.co.uk_kubernetesclusters.yaml
@@ -115,9 +115,9 @@ spec:
               type: boolean
           type: object
       type: object
-  version: v1alpha1
+  version: v1alpha2
   versions:
-  - name: v1alpha1
+  - name: v1alpha2
     served: true
     storage: true
 status:

diff --git a/config/crd/bases/infrastructure.lukeaddison.co.uk_kubernetesmachines.yaml b/config/crd/bases/infrastructure.lukeaddison.co.uk_kubernetesmachines.yaml
@@ -5592,9 +5592,9 @@ spec:
               type: boolean
           type: object
       type: object
-  version: v1alpha1
+  version: v1alpha2
   versions:
-  - name: v1alpha1
+  - name: v1alpha2
     served: true
     storage: true
 status:

diff --git a/config/crd/bases/infrastructure.lukeaddison.co.uk_kubernetesmachinetemplates.yaml b/config/crd/bases/infrastructure.lukeaddison.co.uk_kubernetesmachinetemplates.yaml
@@ -5943,9 +5943,9 @@ spec:
           - template
           type: object
       type: object
-  version: v1alpha1
+  version: v1alpha2
   versions:
-  - name: v1alpha1
+  - name: v1alpha2
     served: true
     storage: true
 status:

diff --git a/config/samples/infrastructure_v1alpha1_kubernetescluster.yaml b/config/samples/infrastructure_v1alpha1_kubernetescluster.yaml
@@ -1,4 +1,4 @@
-apiVersion: infrastructure.lukeaddison.co.uk/v1alpha1
+apiVersion: infrastructure.lukeaddison.co.uk/v1alpha2
 kind: KubernetesCluster
 metadata:
   name: kubernetescluster-sample

diff --git a/config/samples/infrastructure_v1alpha1_kubernetesmachine.yaml b/config/samples/infrastructure_v1alpha1_kubernetesmachine.yaml
@@ -1,4 +1,4 @@
-apiVersion: infrastructure.lukeaddison.co.uk/v1alpha1
+apiVersion: infrastructure.lukeaddison.co.uk/v1alpha2
 kind: KubernetesMachine
 metadata:
   name: kubernetesmachine-sample

diff --git a/config/samples/infrastructure_v1alpha1_kubernetesmachinetemplate.yaml b/config/samples/infrastructure_v1alpha1_kubernetesmachinetemplate.yaml
@@ -1,4 +1,4 @@
-apiVersion: infrastructure.lukeaddison.co.uk/v1alpha1
+apiVersion: infrastructure.lukeaddison.co.uk/v1alpha2
 kind: KubernetesMachineTemplate
 metadata:
   name: kubernetesmachinetemplate-sample

diff --git a/controllers/kubernetescluster_controller.go b/controllers/kubernetescluster_controller.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	capkv1 "github.com/dippynark/cluster-api-provider-kubernetes/api/v1alpha1"
+	capkv1 "github.com/dippynark/cluster-api-provider-kubernetes/api/v1alpha2"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"

diff --git a/controllers/kubernetesmachine_controller.go b/controllers/kubernetesmachine_controller.go
@@ -21,7 +21,7 @@ import (
 	"path"
 	"time"
 
-	capkv1 "github.com/dippynark/cluster-api-provider-kubernetes/api/v1alpha1"
+	capkv1 "github.com/dippynark/cluster-api-provider-kubernetes/api/v1alpha2"
 	utils "github.com/dippynark/cluster-api-provider-kubernetes/pkg/utils"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"

diff --git a/controllers/kubernetesmachine_utils.go b/controllers/kubernetesmachine_utils.go
@@ -6,8 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	capkv1 "github.com/dippynark/cluster-api-provider-kubernetes/api/v1alpha1"
-	infrav1 "github.com/dippynark/cluster-api-provider-kubernetes/api/v1alpha1"
+	capkv1 "github.com/dippynark/cluster-api-provider-kubernetes/api/v1alpha2"
 	"github.com/dippynark/cluster-api-provider-kubernetes/pkg/cloudinit"
 	"github.com/dippynark/cluster-api-provider-kubernetes/pkg/pod"
 	"github.com/pkg/errors"
@@ -76,7 +75,7 @@ func (r *KubernetesMachineReconciler) createPersistentVolumeClaims(kubernetesMac
 // updateStorage updates pod's Volumes to conform with the PersistentVolumeClaim
 // of kubernetesMachine's templates. If pod has conflicting local Volumes these
 // are replaced with Volumes that conform to the kubernetesMachine's templates.
-func (r *KubernetesMachineReconciler) updateStorage(kubernetesMachine *infrav1.KubernetesMachine, machinePod *corev1.Pod) error {
+func (r *KubernetesMachineReconciler) updateStorage(kubernetesMachine *capkv1.KubernetesMachine, machinePod *corev1.Pod) error {
 	currentVolumes := machinePod.Spec.Volumes
 	claims, err := r.getPersistentVolumeClaims(kubernetesMachine)
 	if err != nil {
@@ -200,7 +199,7 @@ func machinePodImage(machine *clusterv1.Machine) string {
 	return fmt.Sprintf("%s:%s", defaultImageName, *machine.Spec.Version)
 }
 
-func machinePodName(kubernetsMachine *infrav1.KubernetesMachine) string {
+func machinePodName(kubernetsMachine *capkv1.KubernetesMachine) string {
 	return kubernetsMachine.Name
 }
 

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -22,7 +22,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	infrastructurev1alpha1 "github.com/dippynark/cluster-api-provider-kubernetes/api/v1alpha1"
+	infrastructurev1alpha2 "github.com/dippynark/cluster-api-provider-kubernetes/api/v1alpha2"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -60,10 +60,10 @@ var _ = BeforeSuite(func(done Done) {
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
 
-	err = infrastructurev1alpha1.AddToScheme(scheme.Scheme)
+	err = infrastructurev1alpha2.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
-	err = infrastructurev1alpha1.AddToScheme(scheme.Scheme)
+	err = infrastructurev1alpha2.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
 	// +kubebuilder:scaffold:scheme

diff --git a/docs/persistent-control-plane.md b/docs/persistent-control-plane.md
@@ -21,7 +21,7 @@ supports [dynamic volume provisioning].
 
 ```yaml
 kind: KubernetesMachine
-apiVersion: infrastructure.lukeaddison.co.uk/v1alpha1
+apiVersion: infrastructure.lukeaddison.co.uk/v1alpha2
 metadata:
   name: controller
 spec:

diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt
@@ -11,4 +11,4 @@ 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.
-*/
+*/
diff --git a/main.go b/main.go
@@ -19,7 +19,7 @@ import (
 	"flag"
 	"os"
 
-	infrav1 "github.com/dippynark/cluster-api-provider-kubernetes/api/v1alpha1"
+	capkv1 "github.com/dippynark/cluster-api-provider-kubernetes/api/v1alpha2"
 	"github.com/dippynark/cluster-api-provider-kubernetes/controllers"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -40,7 +40,7 @@ func init() {
 	_ = clientgoscheme.AddToScheme(scheme)
 	_ = clusterv1.AddToScheme(scheme)
 
-	_ = infrav1.AddToScheme(scheme)
+	_ = capkv1.AddToScheme(scheme)
 	// +kubebuilder:scaffold:scheme
 }