Add capa-controller-manager

openshift · Jan 5, 2021 · 596b3e3 · 596b3e3
1 parent 2decf38
commit 596b3e3
Show file tree

Hide file tree

Showing 22 changed files with 431 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,4 @@ tools/bin
 
 config/example-cluster/ssh-key
 config/example-cluster/pull-secret
+config/example-cluster/aws-creds
diff --git a/README.md b/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:
 

diff --git a/api/v1alpha1/hosted_controlplane.go b/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

diff --git a/api/v1alpha1/openshiftcluster_types.go b/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"`
 }

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/cluster-api/kustomization.yaml b/config/cluster-api/kustomization.yaml
@@ -7,13 +7,13 @@ resources:
 - cluster.x-k8s.io_machines.yaml
 - cluster.x-k8s.io_machinedeployments.yaml
 - cluster.x-k8s.io_machinehealthchecks.yaml
-- manager-serviceaccount.yaml
-- manager-clusterrole.yaml
-- manager-clusterrolebinding.yaml
-- manager-deployment.yaml
 - infrastructure.cluster.x-k8s.io_awsclusters.yaml
 - infrastructure.cluster.x-k8s.io_awsmachinepools.yaml
 - infrastructure.cluster.x-k8s.io_awsmachines.yaml
 - infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml
 - infrastructure.cluster.x-k8s.io_awsmanagedclusters.yaml
 - infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml
+- manager-serviceaccount.yaml
+- manager-clusterrole.yaml
+- manager-clusterrolebinding.yaml
+- manager-deployment.yaml
diff --git a/config/cluster-api/manager-clusterrole.yaml b/config/cluster-api/manager-clusterrole.yaml
@@ -30,8 +30,8 @@ rules:
   resources:
   - hostedcontrolplanes
   - hostedcontrolplanes/status
-  - guestclusters
-  - guestclusters/status
+  - externalinfraclusters
+  - externalinfraclusters/status
   verbs:
   - '*'
 - apiGroups:

diff --git a/config/cluster-api/manager-deployment.yaml b/config/cluster-api/manager-deployment.yaml
@@ -22,4 +22,5 @@ spec:
         - /manager
         args:
         - --namespace=hypershift
+        - --alsologtostderr
         - --v=4
diff --git a/config/example-cluster/cluster.yaml b/config/example-cluster/cluster.yaml
@@ -12,3 +12,5 @@ spec:
     name: pull-secret
   sshKey:
     name: ssh-key
+  providerCreds:
+    name: provider-creds
diff --git a/config/example-cluster/kustomization.yaml b/config/example-cluster/kustomization.yaml
@@ -20,7 +20,7 @@ secretGenerator:
   files:
   - id_rsa.pub=ssh-key
   type: Opaque
-- name: aws-creds
+- name: provider-creds
   options:
     disableNameSuffixHash: true
   files:

diff --git a/config/hypershift-operator/hypershift.openshift.io_hostedcontrolplanes.yaml b/config/hypershift-operator/hypershift.openshift.io_hostedcontrolplanes.yaml
@@ -39,6 +39,13 @@ spec:
             properties:
               podCIDR:
                 type: string
+              providerCreds:
+                description: LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace.
+                properties:
+                  name:
+                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                    type: string
+                type: object
               pullSecret:
                 description: LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace.
                 properties:
@@ -59,6 +66,7 @@ spec:
                 type: object
             required:
             - podCIDR
+            - providerCreds
             - pullSecret
             - releaseImage
             - serviceCIDR

diff --git a/config/hypershift-operator/hypershift.openshift.io_openshiftclusters.yaml b/config/hypershift-operator/hypershift.openshift.io_openshiftclusters.yaml
@@ -39,6 +39,13 @@ spec:
                 type: integer
               podCIDR:
                 type: string
+              providerCreds:
+                description: LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace.
+                properties:
+                  name:
+                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                    type: string
+                type: object
               pullSecret:
                 description: PullSecret is a pull secret injected into the container runtime of guest workers. It should have an ".dockerconfigjson" key containing the pull secret JSON.
                 properties:
@@ -68,6 +75,7 @@ spec:
             required:
             - initialComputeReplicas
             - podCIDR
+            - providerCreds
             - pullSecret
             - release
             - serviceCIDR

diff --git a/hypershift-operator/assets/controlplane/hypershift/bindata.go b/hypershift-operator/assets/controlplane/hypershift/bindata.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,3 +30,4 @@ tools/bin

		config/example-cluster/ssh-key
		config/example-cluster/pull-secret
		config/example-cluster/aws-creds