Add ReplicaCount to AKODeploymentConfig

Signed-off-by: Christian Ang <[email protected]>

Author: christianang

api/v1alpha1/akodeploymentconfig_types.go

@@ -98,6 +98,13 @@ type AKODeploymentConfigSpec struct {
 
 // ExtraConfigs contains extra configurations for AKO Deployment
 type ExtraConfigs struct {
+	// Defines the number of AKO instances to deploy to allow of high availablity. Max number of replicas is two.
+	// Default value: 1
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=2
+	// +optional
+	ReplicaCount *int `json:"replicaCount,omitempty"`
+
 	// Defines AKO instance is primary or not. Value `true` indicates that AKO instance is primary.
 	// In a multiple AKO deployment in a cluster, only one AKO instance should be primary.
 	// Default value: true.

api/v1alpha1/zz_generated.deepcopy.go

@@ -461,6 +461,13 @@ spec:
                           the PodSecurityPolicy
                         type: string
                     type: object
+                  replicaCount:
+                    description: |-
+                      Defines the number of AKO instances to deploy to allow of high availablity. Max number of replicas is two.
+                      Default value: 1
+                    maximum: 2
+                    minimum: 1
+                    type: integer
                   servicesAPI:
                     description: |-
                       ServicesAPI specifies if enables AKO in services API mode: https://kubernetes-sigs.github.io/service-apis/.

config/crd/bases/networking.tkg.tanzu.vmware.com_akodeploymentconfigs.yaml

@@ -465,6 +465,13 @@ spec:
                           the PodSecurityPolicy
                         type: string
                     type: object
+                  replicaCount:
+                    description: |-
+                      Defines the number of AKO instances to deploy to allow of high availablity. Max number of replicas is two.
+                      Default value: 1
+                    maximum: 2
+                    minimum: 1
+                    type: integer
                   servicesAPI:
                     description: |-
                       ServicesAPI specifies if enables AKO in services API mode: https://kubernetes-sigs.github.io/service-apis/.

config/ytt/static.yaml

@@ -49,13 +49,18 @@ func NewValues(obj *akoov1alpha1.AKODeploymentConfig, clusterNameSpacedName stri
 	rbac := NewRbac(obj.Spec.ExtraConfigs.Rbac)
 	featureGates := NewFeatureGates(obj.Spec.ExtraConfigs.FeatureGates)
 
+	replicaCount := 1
+	if obj.Spec.ExtraConfigs.ReplicaCount != nil {
+		replicaCount = *obj.Spec.ExtraConfigs.ReplicaCount
+	}
+
 	return &Values{
 		LoadBalancerAndIngressService: LoadBalancerAndIngressService{
 			Name:      "ako-" + clusterNameSpacedName,
 			Namespace: akoov1alpha1.AviNamespace,
 			Config: Config{
 				IsClusterService:      "",
-				ReplicaCount:          1,
+				ReplicaCount:          replicaCount,
 				AKOSettings:           akoSettings,
 				NetworkSettings:       networkSettings,
 				L7Settings:            l7Settings,

pkg/ako/values.go

@@ -75,6 +75,8 @@ var _ = Describe("AKO", func() {
 				Expect(k).To(Equal(v))
 			}
 
+			Expect(config.ReplicaCount).To(Equal(*akoDeploymentConfig.Spec.ExtraConfigs.ReplicaCount))
+
 			if len(akoDeploymentConfig.Spec.ExtraConfigs.IngressConfigs.NodeNetworkList) != 0 {
 				nodeNetworkListJson, jsonerr := json.Marshal(akoDeploymentConfig.Spec.ExtraConfigs.IngressConfigs.NodeNetworkList)
 				Expect(jsonerr).ShouldNot(HaveOccurred())
@@ -108,6 +110,7 @@ var _ = Describe("AKO", func() {
 							CIDR: "10.1.0.0/24",
 						},
 						ExtraConfigs: akoov1alpha1.ExtraConfigs{
+							ReplicaCount:      ptr.To(2),
 							FullSyncFrequency: "1900",
 							Rbac: akoov1alpha1.AKORbacConfig{
 								PspEnabled:          ptr.To(true),