Changes to update capa v1beta1 and support golang 1.17

Bring CAPA v1beta1, kube 1.23 deps and golang 1.17. Drops https://github.com/bombsimon/logrusr/ which does not support golang 1.17 in favour of zapr. Adds .ci-operator.yaml so upcoming golang bumps can be done in this repo atomically. Note the TODO in HostedCluster This kubernetes-sigs/cluster-api-provider-aws#2728 broke our assumption in CAPA 0.7 for externally managed infrastructure. This effectively limit our ability to span NodePools across multiple subnets. In a follow up we need to either enable upstream back to support arbitrary subnets IDs in the awsMachine CR or possibly expose a slice of available subnets for NodePools in hcluster.Spec.Platform.AWS.
enxebre · Nov 23, 2021 · 0c77b1a · 0c77b1a
1 parent 5cd9ada
commit 0c77b1a
Show file tree

Hide file tree

Showing 49 changed files with 274 additions and 164 deletions.
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -0,0 +1,4 @@
+build_root_image:
+  namespace: openshift
+  name: release
+  tag: golang-1.17
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/openshift/release:golang-1.16 as builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.17 as builder
 
 WORKDIR /hypershift
 

diff --git a/Makefile b/Makefile
@@ -113,8 +113,8 @@ cluster-api: $(CONTROLLER_GEN)
 .PHONY: cluster-api-provider-aws
 cluster-api-provider-aws: $(CONTROLLER_GEN)
 	rm -rf cmd/install/assets/cluster-api-provider-aws/*.yaml
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/sigs.k8s.io/cluster-api-provider-aws/api/v1alpha4" output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-aws
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/sigs.k8s.io/cluster-api-provider-aws/exp/api/v1alpha4" output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-aws
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/sigs.k8s.io/cluster-api-provider-aws/api/v1beta1" output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-aws
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/sigs.k8s.io/cluster-api-provider-aws/exp/api/v1beta1" output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-aws
 
 .PHONY: cluster-api-provider-ibmcloud
 cluster-api-provider-ibmcloud: $(CONTROLLER_GEN)

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ The `hypershift` CLI tool helps you install and work with HyperShift.
 
 **Prerequisites:**
 
-* Go 1.16
+* Go 1.17
 
 Install the `hypershift` CLI using Go:
 

diff --git a/api/scheme.go b/api/scheme.go
@@ -15,7 +15,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 	kasv1beta1 "k8s.io/apiserver/pkg/apis/apiserver/v1beta1"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	capiaws "sigs.k8s.io/cluster-api-provider-aws/api/v1alpha4"
+	capiaws "sigs.k8s.io/cluster-api-provider-aws/api/v1beta1"
 	capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 

diff --git a/api/v1alpha1/capi_types.go b/api/v1alpha1/capi_types.go
@@ -3,8 +3,8 @@ package v1alpha1
 // These imports are used to explicitly declare external API dependencies
 import (
 	_ "github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/api/v1alpha4"
-	_ "sigs.k8s.io/cluster-api-provider-aws/api/v1alpha4"
-	_ "sigs.k8s.io/cluster-api-provider-aws/exp/api/v1alpha4"
+	_ "sigs.k8s.io/cluster-api-provider-aws/api/v1beta1"
+	_ "sigs.k8s.io/cluster-api-provider-aws/exp/api/v1beta1"
 	_ "sigs.k8s.io/cluster-api/api/v1beta1"
 	_ "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	_ "sigs.k8s.io/cluster-api/exp/api/v1beta1"

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/availability-prober/main.go b/availability-prober/main.go
@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/bombsimon/logrusr"
 	"github.com/go-logr/logr"
 	"github.com/sirupsen/logrus"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 type options struct {
@@ -21,7 +21,7 @@ func main() {
 	flag.StringVar(&opts.target, "target", "", "A http url to probe. The program will continue until it gets a http 2XX back.")
 	flag.Parse()
 
-	log := logrusr.NewLogger(logrus.New())
+	log := zap.New(zap.UseDevMode(true), zap.JSONEncoder())
 
 	url, err := url.Parse(opts.target)
 	if err != nil {

diff --git a/cmd/bastion/aws/logging.go b/cmd/bastion/aws/logging.go
@@ -1,8 +1,5 @@
 package aws
 
-import (
-	"github.com/bombsimon/logrusr"
-	"github.com/sirupsen/logrus"
-)
+import "sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-var log = logrusr.NewLogger(logrus.New())
+var log = zap.New(zap.UseDevMode(true), zap.JSONEncoder())
diff --git a/cmd/cluster/aws/dump.go b/cmd/cluster/aws/dump.go
@@ -20,7 +20,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	kubeclient "k8s.io/client-go/kubernetes"
 	restclient "k8s.io/client-go/rest"
-	capiaws "sigs.k8s.io/cluster-api-provider-aws/api/v1alpha4"
+	capiaws "sigs.k8s.io/cluster-api-provider-aws/api/v1beta1"
 	capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

diff --git a/cmd/cluster/aws/log.go b/cmd/cluster/aws/log.go
@@ -1,8 +1,5 @@
 package aws
 
-import (
-	"github.com/bombsimon/logrusr"
-	"github.com/sirupsen/logrus"
-)
+import "sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-var log = logrusr.NewLogger(logrus.New())
+var log = zap.New(zap.UseDevMode(true), zap.JSONEncoder())
diff --git a/cmd/cluster/core/log.go b/cmd/cluster/core/log.go
@@ -1,8 +1,7 @@
 package core
 
 import (
-	"github.com/bombsimon/logrusr"
-	"github.com/sirupsen/logrus"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-var log = logrusr.NewLogger(logrus.New())
+var log = zap.New(zap.UseDevMode(true), zap.JSONEncoder())
diff --git a/cmd/cluster/none/log.go b/cmd/cluster/none/log.go
@@ -1,8 +1,7 @@
 package none
 
 import (
-	"github.com/bombsimon/logrusr"
-	"github.com/sirupsen/logrus"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-var log = logrusr.NewLogger(logrus.New())
+var log = zap.New(zap.UseDevMode(true), zap.JSONEncoder())
diff --git a/cmd/consolelogs/aws/logging.go b/cmd/consolelogs/aws/logging.go
@@ -1,8 +1,5 @@
 package aws
 
-import (
-	"github.com/bombsimon/logrusr"
-	"github.com/sirupsen/logrus"
-)
+import "sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-var log = logrusr.NewLogger(logrus.New())
+var log = zap.New(zap.UseDevMode(true), zap.JSONEncoder())
diff --git a/cmd/infra/aws/logging.go b/cmd/infra/aws/logging.go
@@ -1,8 +1,5 @@
 package aws
 
-import (
-	"github.com/bombsimon/logrusr"
-	"github.com/sirupsen/logrus"
-)
+import "sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-var log = logrusr.NewLogger(logrus.New())
+var log = zap.New(zap.UseDevMode(true), zap.JSONEncoder())
diff --git a/cmd/install/assets/assets.go b/cmd/install/assets/assets.go
@@ -28,10 +28,10 @@ const capiLabel = "cluster.x-k8s.io/v1beta1"
 // to satisfy CAPI contracts. There might be a way to achieve this during CRD
 // generation, but for now we're just post-processing at runtime here.
 var capiResources = map[string]string{
-	"cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclusters.yaml":         "v1alpha4",
-	"cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmachines.yaml":         "v1alpha4",
-	"cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml": "v1alpha4",
-	"cluster-api-provider-ibmcloud/infrastructure.cluster.x-k8s.io_ibmvpcclusters.yaml": "v1alpha4",
+	"cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclusters.yaml":         "v1beta1",
+	"cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmachines.yaml":         "v1beta1",
+	"cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml": "v1beta1",
+	"cluster-api-provider-ibmcloud/infrastructure.cluster.x-k8s.io_ibmvpcclusters.yaml": "v1beta1",
 	"hypershift-operator/hypershift.openshift.io_hostedcontrolplanes.yaml":              "v1alpha1",
 }
 

diff --git a/...ster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclustercontrolleridentities.yaml b/...ster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclustercontrolleridentities.yaml
@@ -20,7 +20,7 @@ spec:
     singular: awsclustercontrolleridentity
   scope: Cluster
   versions:
-  - name: v1alpha4
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         description: AWSClusterControllerIdentity is the Schema for the awsclustercontrolleridentities

diff --git a/...ts/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclusterroleidentities.yaml b/...ts/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclusterroleidentities.yaml
@@ -20,7 +20,7 @@ spec:
     singular: awsclusterroleidentity
   scope: Cluster
   versions:
-  - name: v1alpha4
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         description: AWSClusterRoleIdentity is the Schema for the awsclusterroleidentities

diff --git a/cmd/install/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclusters.yaml b/cmd/install/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclusters.yaml
@@ -42,10 +42,11 @@ spec:
       jsonPath: .status.bastion.publicIp
       name: Bastion IP
       type: string
-    name: v1alpha4
+    name: v1beta1
     schema:
       openAPIV3Schema:
-        description: AWSCluster is the Schema for the awsclusters API.
+        description: AWSCluster is the schema for Amazon EC2 based Kubernetes Cluster
+          API.
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -60,7 +61,8 @@ spec:
           metadata:
             type: object
           spec:
-            description: AWSClusterSpec defines the desired state of AWSCluster
+            description: AWSClusterSpec defines the desired state of an EC2-based
+              Kubernetes cluster.
             properties:
               additionalTags:
                 additionalProperties:
@@ -137,12 +139,21 @@ spec:
                       registered instances in its Availability Zone only. \n Defaults
                       to false."
                     type: boolean
+                  name:
+                    description: Name sets the name of the classic ELB load balancer.
+                      As per AWS, the name must be unique within your set of load
+                      balancers for the region, must have a maximum of 32 characters,
+                      must contain only alphanumeric characters or hyphens, and cannot
+                      begin or end with a hyphen. Once set, the value cannot be changed.
+                    maxLength: 32
+                    pattern: ^[A-Za-z0-9]([A-Za-z0-9]{0,31}|[-A-Za-z0-9]{0,30}[A-Za-z0-9])$
+                    type: string
                   scheme:
-                    default: Internet-facing
+                    default: internet-facing
                     description: Scheme sets the scheme of the load balancer (defaults
-                      to Internet-facing)
+                      to internet-facing)
                     enum:
-                    - Internet-facing
+                    - internet-facing
                     - internal
                     type: string
                   subnets:
@@ -335,7 +346,7 @@ spec:
                 type: string
             type: object
           status:
-            description: AWSClusterStatus defines the observed state of AWSCluster
+            description: AWSClusterStatus defines the observed state of AWSCluster.
             properties:
               bastion:
                 description: Instance describes an AWS instance.
@@ -390,7 +401,7 @@ spec:
                     description: Configuration options for the non root storage volumes.
                     items:
                       description: Volume encapsulates the configuration options for
-                        the storage device
+                        the storage device.
                       properties:
                         deviceName:
                           description: Device name
@@ -566,6 +577,7 @@ spec:
                         important.
                       type: string
                   required:
+                  - lastTransitionTime
                   - status
                   - type
                   type: object

diff --git a/.../cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml b/.../cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml
@@ -20,7 +20,7 @@ spec:
     singular: awsclusterstaticidentity
   scope: Cluster
   versions:
-  - name: v1alpha4
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         description: AWSClusterStaticIdentity is the Schema for the awsclusterstaticidentities

diff --git a/.../assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml b/.../assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml
@@ -20,11 +20,11 @@ spec:
     singular: awsclustertemplate
   scope: Namespaced
   versions:
-  - name: v1alpha4
+  - name: v1beta1
     schema:
       openAPIV3Schema:
-        description: AWSClusterTemplate is the Schema for the awsclustertemplates
-          API.
+        description: AWSClusterTemplate is the schema for Amazon EC2 based Kubernetes
+          Cluster Templates.
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -43,8 +43,30 @@ spec:
             properties:
               template:
                 properties:
+                  metadata:
+                    description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        description: 'Annotations is an unstructured key value map
+                          stored with a resource that may be set by external tools
+                          to store and retrieve arbitrary metadata. They are not queryable
+                          and should be preserved when modifying objects. More info:
+                          http://kubernetes.io/docs/user-guide/annotations'
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        description: 'Map of string keys and values that can be used
+                          to organize and categorize (scope and select) objects. May
+                          match selectors of replication controllers and services.
+                          More info: http://kubernetes.io/docs/user-guide/labels'
+                        type: object
+                    type: object
                   spec:
-                    description: AWSClusterSpec defines the desired state of AWSCluster
+                    description: AWSClusterSpec defines the desired state of an EC2-based
+                      Kubernetes cluster.
                     properties:
                       additionalTags:
                         additionalProperties:
@@ -125,12 +147,22 @@ spec:
                               registered instances in its Availability Zone only.
                               \n Defaults to false."
                             type: boolean
+                          name:
+                            description: Name sets the name of the classic ELB load
+                              balancer. As per AWS, the name must be unique within
+                              your set of load balancers for the region, must have
+                              a maximum of 32 characters, must contain only alphanumeric
+                              characters or hyphens, and cannot begin or end with
+                              a hyphen. Once set, the value cannot be changed.
+                            maxLength: 32
+                            pattern: ^[A-Za-z0-9]([A-Za-z0-9]{0,31}|[-A-Za-z0-9]{0,30}[A-Za-z0-9])$
+                            type: string
                           scheme:
-                            default: Internet-facing
+                            default: internet-facing
                             description: Scheme sets the scheme of the load balancer
-                              (defaults to Internet-facing)
+                              (defaults to internet-facing)
                             enum:
-                            - Internet-facing
+                            - internet-facing
                             - internal
                             type: string
                           subnets:

diff --git a/...l/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsfargateprofiles.yaml b/...l/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsfargateprofiles.yaml
@@ -33,10 +33,10 @@ spec:
       jsonPath: .status.failureReason
       name: FailureReason
       type: string
-    name: v1alpha4
+    name: v1beta1
     schema:
       openAPIV3Schema:
-        description: AWSFargateProfile is the Schema for the awsfargateprofiles API
+        description: AWSFargateProfile is the Schema for the awsfargateprofiles API.
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -51,7 +51,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: FargateProfileSpec defines the desired state of FargateProfile
+            description: FargateProfileSpec defines the desired state of FargateProfile.
             properties:
               additionalTags:
                 additionalProperties:
@@ -78,7 +78,7 @@ spec:
                 description: Selectors specify fargate pod selectors.
                 items:
                   description: FargateSelector specifies a selector for pods that
-                    should run on this fargate pool
+                    should run on this fargate pool.
                   properties:
                     labels:
                       additionalProperties:
@@ -102,7 +102,7 @@ spec:
             - clusterName
             type: object
           status:
-            description: FargateProfileStatus defines the observed state of FargateProfile
+            description: FargateProfileStatus defines the observed state of FargateProfile.
             properties:
               conditions:
                 description: Conditions defines current state of the Fargate profile.
@@ -144,6 +144,7 @@ spec:
                         important.
                       type: string
                   required:
+                  - lastTransitionTime
                   - status
                   - type
                   type: object