Merge pull request #2831 from randomvariable/capi-v1.0.0

Update to Cluster API v1.0.0
kubernetes-sigs · Oct 7, 2021 · 1d97ec3 · 1d97ec3
2 parents d5ac5f1 + 1c8f8b9
commit 1d97ec3
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 66 deletions.
diff --git a/docs/book/gen-crd-api-reference-docs/config.json b/docs/book/gen-crd-api-reference-docs/config.json
@@ -39,9 +39,13 @@
       "typeMatchPrefix": "^sigs\\.k8s\\.io/cluster-api/api/v1alpha4",
       "docsURLTemplate": "https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v0.4.1"
     },
+    {
+      "typeMatchPrefix": "^sigs\\.k8s\\.io/cluster-api/api/v1beta1",
+      "docsURLTemplate": "https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0"
+    },
     {
       "typeMatchPrefix": "^sigs\\.k8s\\.io/cluster-api/errors",
-      "docsURLTemplate": "https://pkg.go.dev/sigs.k8s.io/cluster-api@v0.4.1/errors#{{.TypeIdentifier}}"
+      "docsURLTemplate": "https://pkg.go.dev/sigs.k8s.io/cluster-api@v1.0.0/errors#{{.TypeIdentifier}}"
     },
     {
       "typeMatchPrefix": "^time\\.Duration",

diff --git a/docs/book/src/crd/index.md b/docs/book/src/crd/index.md
@@ -2354,7 +2354,9 @@ int64
 <td>
 <code>conditions</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.Conditions
+</a>
 </em>
 </td>
 <td>
@@ -4488,7 +4490,9 @@ EndpointAccess
 <td>
 <code>controlPlaneEndpoint</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.APIEndpoint
+</a>
 </em>
 </td>
 <td>
@@ -4857,7 +4861,9 @@ EndpointAccess
 <td>
 <code>controlPlaneEndpoint</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.APIEndpoint
+</a>
 </em>
 </td>
 <td>
@@ -5034,7 +5040,9 @@ Cluster API AWS api/v1beta1.NetworkStatus
 <td>
 <code>failureDomains</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.FailureDomains
+</a>
 </em>
 </td>
 <td>
@@ -5122,7 +5130,9 @@ state, and will be set to a descriptive error message.</p>
 <td>
 <code>conditions</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.Conditions
+</a>
 </em>
 </td>
 <td>
@@ -8071,7 +8081,7 @@ InstanceState
 <td>
 <code>failureReason</code><br/>
 <em>
-<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v0.4.1/errors#MachineStatusError">
+<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v1.0.0/errors#MachineStatusError">
 Cluster API errors.MachineStatusError
 </a>
 </em>
@@ -11454,7 +11464,7 @@ string
 <td>
 <code>failureReason</code><br/>
 <em>
-<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v0.4.1/errors#MachineStatusError">
+<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v1.0.0/errors#MachineStatusError">
 Cluster API errors.MachineStatusError
 </a>
 </em>
@@ -12041,7 +12051,7 @@ int32
 <td>
 <code>failureReason</code><br/>
 <em>
-<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v0.4.1/errors#MachineStatusError">
+<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v1.0.0/errors#MachineStatusError">
 Cluster API errors.MachineStatusError
 </a>
 </em>
@@ -12487,7 +12497,7 @@ bool
 <td>
 <code>failureReason</code><br/>
 <em>
-<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v0.4.1/errors#MachineStatusError">
+<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v1.0.0/errors#MachineStatusError">
 Cluster API errors.MachineStatusError
 </a>
 </em>
@@ -13143,7 +13153,9 @@ string
 <td>
 <code>controlPlaneEndpoint</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.APIEndpoint
+</a>
 </em>
 </td>
 <td>
@@ -13656,7 +13668,9 @@ string
 <td>
 <code>controlPlaneEndpoint</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.APIEndpoint
+</a>
 </em>
 </td>
 <td>
@@ -13941,7 +13955,9 @@ NetworkStatus
 <td>
 <code>failureDomains</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.FailureDomains
+</a>
 </em>
 </td>
 <td>
@@ -13963,7 +13979,9 @@ Instance
 <td>
 <code>conditions</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.Conditions
+</a>
 </em>
 </td>
 <td>
@@ -14047,7 +14065,9 @@ AWSClusterTemplateResource
 <td>
 <code>metadata</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.ObjectMeta
+</a>
 </em>
 </td>
 <td>
@@ -14111,7 +14131,9 @@ string
 <td>
 <code>controlPlaneEndpoint</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.APIEndpoint
+</a>
 </em>
 </td>
 <td>
@@ -15087,7 +15109,9 @@ This will be set to true when SpotMarketOptions is not nil (i.e. this machine is
 <td>
 <code>addresses</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 []Cluster API api/v1beta1.MachineAddress
+</a>
 </em>
 </td>
 <td>
@@ -15112,7 +15136,7 @@ InstanceState
 <td>
 <code>failureReason</code><br/>
 <em>
-<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v0.4.1/errors#MachineStatusError">
+<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v1.0.0/errors#MachineStatusError">
 Cluster API errors.MachineStatusError
 </a>
 </em>
@@ -15164,7 +15188,9 @@ controller&rsquo;s output.</p>
 <td>
 <code>conditions</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.Conditions
+</a>
 </em>
 </td>
 <td>
@@ -15251,7 +15277,9 @@ AWSMachineTemplateResource
 <td>
 <code>metadata</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.ObjectMeta
+</a>
 </em>
 </td>
 <td>
@@ -16722,7 +16750,9 @@ string
 <td>
 <code>addresses</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 []Cluster API api/v1beta1.MachineAddress
+</a>
 </em>
 </td>
 <td>
@@ -18243,7 +18273,9 @@ int32
 <td>
 <code>conditions</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.Conditions
+</a>
 </em>
 </td>
 <td>
@@ -18280,7 +18312,7 @@ string
 <td>
 <code>failureReason</code><br/>
 <em>
-<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v0.4.1/errors#MachineStatusError">
+<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v1.0.0/errors#MachineStatusError">
 Cluster API errors.MachineStatusError
 </a>
 </em>
@@ -18891,7 +18923,7 @@ int32
 <td>
 <code>failureReason</code><br/>
 <em>
-<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v0.4.1/errors#MachineStatusError">
+<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v1.0.0/errors#MachineStatusError">
 Cluster API errors.MachineStatusError
 </a>
 </em>
@@ -18943,7 +18975,9 @@ controller&rsquo;s output.</p>
 <td>
 <code>conditions</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.Conditions
+</a>
 </em>
 </td>
 <td>
@@ -19329,7 +19363,7 @@ bool
 <td>
 <code>failureReason</code><br/>
 <em>
-<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v0.4.1/errors#MachineStatusError">
+<a href="https://pkg.go.dev/sigs.k8s.io/cluster-api@v1.0.0/errors#MachineStatusError">
 Cluster API errors.MachineStatusError
 </a>
 </em>
@@ -19381,7 +19415,9 @@ object and/or logged in the controller&rsquo;s output.</p>
 <td>
 <code>conditions</code><br/>
 <em>
+<a href="https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0">
 Cluster API api/v1beta1.Conditions
+</a>
 </em>
 </td>
 <td>

diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-aws
 
 go 1.16
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.0.0-rc.0.0.20211006034833-18ecf48ff1ca
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.0.0
 
 // Versions to be held for v1beta1
 // sigs.k8s.io/controller-runtime on v0.10.x
@@ -20,12 +20,10 @@ require (
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/containerd/containerd v1.5.7 // indirect
 	github.com/coredns/caddy v1.1.1 // indirect
-	github.com/coredns/corefile-migration v1.0.13 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
 	github.com/docker/docker v20.10.9+incompatible // indirect
 	github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
 	github.com/evanphx/json-patch/v5 v5.5.0 // indirect
-	github.com/fatih/color v1.13.0 // indirect
 	github.com/go-logr/logr v0.4.0
 	github.com/gofrs/flock v0.8.1
 	github.com/golang/mock v1.6.0
@@ -48,7 +46,6 @@ require (
 	github.com/sergi/go-diff v1.2.0
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.9.0 // indirect
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
 	golang.org/x/net v0.0.0-20211005215030-d2e5035098b3
 	golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef // indirect
@@ -62,15 +59,13 @@ require (
 	k8s.io/apimachinery v0.22.2
 	k8s.io/cli-runtime v0.22.2
 	k8s.io/client-go v0.22.2
-	k8s.io/cluster-bootstrap v0.22.2 // indirect
 	k8s.io/component-base v0.22.2
 	k8s.io/klog/v2 v2.10.0
 	k8s.io/kube-openapi v0.0.0-20210929172449-94abcedd1aa4 // indirect
-	k8s.io/kubectl v0.22.2 // indirect
 	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
 	sigs.k8s.io/aws-iam-authenticator v0.5.3
-	sigs.k8s.io/cluster-api v1.0.0-rc.0.0.20211006034833-18ecf48ff1ca
-	sigs.k8s.io/cluster-api/test v1.0.0-rc.0.0.20211006034833-18ecf48ff1ca
+	sigs.k8s.io/cluster-api v1.0.0
+	sigs.k8s.io/cluster-api/test v1.0.0
 	sigs.k8s.io/controller-runtime v0.10.2
 	sigs.k8s.io/yaml v1.3.0
 )