Capi machines

.gitignore

@@ -30,3 +30,4 @@ tools/bin
 
 config/example-cluster/ssh-key
 config/example-cluster/pull-secret
+config/example-cluster/aws-creds

README.md

@@ -27,7 +27,8 @@ $ make uninstall
 First, create the following files containing secrets used by the example cluster:
 
 - `config/example-cluster/pull-secret` a valid pull secret for image pulls.
-- `config/example-cluster/ssh-key` an SSH public key for guest node access
+- `config/example-cluster/ssh-key` an SSH public key for guest node access.
+- `config/example-cluster/aws-creds` an [aws credentials file](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html).
 
 Install the example cluster:
 
@@ -44,7 +45,7 @@ $ make example-cluster
 When the cluster is available, get the guest kubeconfig using:
 
 ```bash
-$ oc get secret --namespace example admin-kubeconfig --template={{.data.kubeconfig}} | base64 -D
+$ oc get secret --namespace hypershift example-kubeconfig --template={{.data.value}} | base64 -D
 ```
 
 To create additional node pools, create a resource like:

api/v1alpha1/guest_cluster.go → api/v1alpha1/externalinfracluster.go

@@ -5,25 +5,25 @@ import (
 )
 
 func init() {
-	SchemeBuilder.Register(&GuestCluster{})
-	SchemeBuilder.Register(&GuestClusterList{})
+	SchemeBuilder.Register(&ExternalInfraCluster{})
+	SchemeBuilder.Register(&ExternalInfraClusterList{})
 }
 
-// +kubebuilder:resource:path=guestclusters,shortName=gc;gcs,scope=Namespaced,categories=cluster-api
+// +kubebuilder:resource:path=externalinfraclusters,shortName=eic;eics,scope=Namespaced,categories=cluster-api
 // +kubebuilder:storageversion
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// GuestCluster is the Schema for the GuestCluster API
-type GuestCluster struct {
+// ExternalInfraCluster is the Schema for the ExternalInfraCluster API
+type ExternalInfraCluster struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   GuestClusterSpec   `json:"spec,omitempty"`
-	Status GuestClusterStatus `json:"status,omitempty"`
+	Spec   ExternalInfraClusterSpec   `json:"spec,omitempty"`
+	Status ExternalInfraClusterStatus `json:"status,omitempty"`
 }
 
-// GuestClusterSpec defines the desired state of GuestCluster
-type GuestClusterSpec struct {
+// ExternalInfraClusterSpec defines the desired state of ExternalInfraCluster
+type ExternalInfraClusterSpec struct {
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// +optional
 	ControlPlaneEndpoint APIEndpoint `json:"controlPlaneEndpoint,omitempty"`
@@ -33,6 +33,7 @@ type GuestClusterSpec struct {
 
 	// TODO (alberto): populate the API and create/consume infrastructure via aws sdk
 	// role profile, sg, vpc, subnets.
+	Region string `json:"region"`
 }
 
 type APIEndpoint struct {
@@ -43,16 +44,16 @@ type APIEndpoint struct {
 	Port int32 `json:"port"`
 }
 
-// GuestClusterStatus defines the observed state of GuestCluster
-type GuestClusterStatus struct {
+// ExternalInfraClusterStatus defines the observed state of ExternalInfraCluster
+type ExternalInfraClusterStatus struct {
 	// +optional
 	Ready bool `json:"ready,omitempty"`
 }
 
 // +kubebuilder:object:root=true
-// GuestClusterList contains a list of GuestClusters.
-type GuestClusterList struct {
+// ExternalInfraClusterList contains a list of ExternalInfraClusters.
+type ExternalInfraClusterList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []GuestCluster `json:"items"`
+	Items           []ExternalInfraCluster `json:"items"`
 }

api/v1alpha1/hosted_controlplane.go

@@ -25,11 +25,12 @@ type HostedControlPlane struct {
 
 // HostedControlPlaneSpec defines the desired state of HostedControlPlane
 type HostedControlPlaneSpec struct {
-	ReleaseImage string                      `json:"releaseImage"`
-	PullSecret   corev1.LocalObjectReference `json:"pullSecret"`
-	ServiceCIDR  string                      `json:"serviceCIDR"`
-	PodCIDR      string                      `json:"podCIDR"`
-	SSHKey       corev1.LocalObjectReference `json:"sshKey"`
+	ReleaseImage  string                      `json:"releaseImage"`
+	PullSecret    corev1.LocalObjectReference `json:"pullSecret"`
+	ServiceCIDR   string                      `json:"serviceCIDR"`
+	PodCIDR       string                      `json:"podCIDR"`
+	SSHKey        corev1.LocalObjectReference `json:"sshKey"`
+	ProviderCreds corev1.LocalObjectReference `json:"providerCreds"`
 }
 
 // HostedControlPlaneStatus defines the observed state of HostedControlPlane

api/v1alpha1/nodepool_types.go

@@ -15,7 +15,7 @@ func init() {
 // +kubebuilder:subresource:status
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:scale:specpath=.spec.nodeCount,statuspath=.status.nodeCount
-// +kubebuilder:printcolumn:name="NodeCount",type="integer",JSONPath=".status.NodeCount",description="Available Nodes"
+// +kubebuilder:printcolumn:name="NodeCount",type="integer",JSONPath=".status.nodeCount",description="Available Nodes"
 type NodePool struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/v1alpha1/openshiftcluster_types.go

@@ -39,6 +39,8 @@ type OpenShiftClusterSpec struct {
 
 	SSHKey corev1.LocalObjectReference `json:"sshKey"`
 
+	ProviderCreds corev1.LocalObjectReference `json:"providerCreds"`
+
 	ServiceCIDR string `json:"serviceCIDR"`
 	PodCIDR     string `json:"podCIDR"`
 }