data: Alphabetize CRD templates

Signed-off-by: Stephen Finucane <[email protected]>

Author: stephenfin

data/data/manifests/openshift/90-okd-sca-pull-disable.yaml.template

@@ -1,6 +1,6 @@
 {{if .IsOKD -}}
-kind: Secret
 apiVersion: v1
+kind: Secret
 metadata:
   name: support
   namespace: openshift-config

data/data/manifests/openshift/cloud-creds-secret.yaml.template

@@ -1,22 +1,4 @@
-kind: Secret
 apiVersion: v1
-metadata:
-  namespace: kube-system
-{{- if .CloudCreds.AWS}}
-  name: aws-creds
-{{- else if .CloudCreds.Azure}}
-  name: azure-credentials
-{{- else if .CloudCreds.GCP}}
-  name: gcp-credentials
-{{- else if .CloudCreds.IBMCloud}}
-  name: ibmcloud-credentials
-{{- else if .CloudCreds.OpenStack}}
-  name: openstack-credentials
-{{- else if .CloudCreds.VSphere}}
-  name: vsphere-creds
-{{- else if .CloudCreds.Ovirt}}
-  name: ovirt-credentials
-{{- end}}
 data:
 {{- if .CloudCreds.AWS}}
   aws_access_key_id: {{.CloudCreds.AWS.Base64encodeAccessKeyID}}
@@ -48,3 +30,21 @@ data:
   ovirt_insecure: {{.CloudCreds.Ovirt.Base64encodeInsecure}}
   ovirt_ca_bundle: {{.CloudCreds.Ovirt.Base64encodeCABundle}}
 {{- end}}
+kind: Secret
+metadata:
+  namespace: kube-system
+{{- if .CloudCreds.AWS}}
+  name: aws-creds
+{{- else if .CloudCreds.Azure}}
+  name: azure-credentials
+{{- else if .CloudCreds.GCP}}
+  name: gcp-credentials
+{{- else if .CloudCreds.IBMCloud}}
+  name: ibmcloud-credentials
+{{- else if .CloudCreds.OpenStack}}
+  name: openstack-credentials
+{{- else if .CloudCreds.VSphere}}
+  name: vsphere-creds
+{{- else if .CloudCreds.Ovirt}}
+  name: ovirt-credentials
+{{- end}}

data/data/manifests/openshift/kubeadmin-password-secret.yaml.template

@@ -1,7 +1,7 @@
-kind: Secret
 apiVersion: v1
+data:
+  kubeadmin: {{.Base64EncodedKubeadminPwHash}}
+kind: Secret
 metadata:
   namespace: kube-system
   name: kubeadmin
-data:
-  kubeadmin: {{.Base64EncodedKubeadminPwHash}}

data/data/manifests/openshift/role-cloud-creds-secret-reader.yaml.template

@@ -1,5 +1,5 @@
-kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
 metadata:
   namespace: kube-system
 {{- if .CloudCreds.AWS}}