Fix aceshifter schema (#645)

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: tamalsaha

apis/installer/v1alpha1/aceshifter_types.go

@@ -50,12 +50,14 @@ type AceshifterSpec struct {
 	FullnameOverride string `json:"fullnameOverride"`
 	//+optional
 	RegistryFQDN string         `json:"registryFQDN"`
+	ReplicaCount int32          `json:"replicaCount"`
 	Image        ImageReference `json:"image"`
 	//+optional
 	ImagePullSecrets []string `json:"imagePullSecrets"`
-	Args             []string `json:"args"`
 	//+optional
 	PodAnnotations map[string]string `json:"podAnnotations"`
+	//+optional
+	PodLabels map[string]string `json:"podLabels"`
 	// PodSecurityContext holds pod-level security attributes and common container settings.
 	// Optional: Defaults to empty.  See type description for default values of each field.
 	// +optional
@@ -72,6 +74,14 @@ type AceshifterSpec struct {
 	// If specified, the pod's scheduling constraints
 	// +optional
 	Affinity *core.Affinity `json:"affinity"`
+	// +optional
+	LivenessProbe *core.Probe `json:"livenessProbe"`
+	// +optional
+	ReadinessProbe *core.Probe        `json:"readinessProbe"`
+	Service        AceServiceSpec     `json:"service"`
+	ServiceAccount ServiceAccountSpec `json:"serviceAccount"`
+	Volumes        []core.Volume      `json:"volumes"`
+	VolumeMounts   []core.VolumeMount `json:"volumeMounts"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

apis/installer/v1alpha1/register.go

@@ -54,10 +54,10 @@ func Resource(resource string) schema.GroupResource {
 // Adds the list of known types to api.Scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
-		&AccountsUi{},
-		&AccountsUiList{},
 		&Acaas{},
 		&AcaasList{},
+		&AccountsUi{},
+		&AccountsUiList{},
 		&Ace{},
 		&AceList{},
 		&AceInstaller{},

apis/installer/v1alpha1/types_test.go

@@ -33,6 +33,7 @@ func TestDefaultValues(t *testing.T) {
 		sc.TestCase{Obj: v1alpha1.AcaasSpec{}},
 		sc.TestCase{Obj: v1alpha1.AccountsUiSpec{}},
 		sc.TestCase{Obj: v1alpha1.AceInstallerSpec{}},
+		sc.TestCase{Obj: v1alpha1.AceshifterSpec{}},
 		sc.TestCase{Obj: v1alpha1.AceSpec{}},
 		sc.TestCase{Obj: v1alpha1.BillingSpec{}},
 		sc.TestCase{Obj: v1alpha1.BillingUiSpec{}},