Configure nsx t1LR in aviinfrasetting

vmware-tanzu · Oct 23, 2023 · baf223e · baf223e
1 parent 78f5693
commit baf223e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/controllers/akodeploymentconfig/akodeploymentconfig_controller.go b/controllers/akodeploymentconfig/akodeploymentconfig_controller.go
@@ -161,6 +161,7 @@ func (r *AKODeploymentConfigReconciler) reconcileDelete(
 
 func (r *AKODeploymentConfigReconciler) secretToAKODeploymentConfig(c client.Client, log logr.Logger) handler.MapFunc {
 	return func(ctx context.Context, o client.Object) []reconcile.Request {
+		ctx = context.Background()
 		secret, ok := o.(*corev1.Secret)
 		if !ok {
 			log.Error(errors.New("invalid type"),

diff --git a/controllers/akodeploymentconfig/akodeploymentconfig_controller_avi_phase.go b/controllers/akodeploymentconfig/akodeploymentconfig_controller_avi_phase.go
@@ -311,6 +311,8 @@ func (r *AKODeploymentConfigReconciler) reconcileAviInfraSetting(
 func (r *AKODeploymentConfigReconciler) createAviInfraSetting(adc *akoov1alpha1.AKODeploymentConfig) *akov1beta1.AviInfraSetting {
 	// ShardVSSize describes ingress shared virtual service size, default value is SMALL
 	shardSize := "SMALL"
+	//TODO(chenlin): Get t1LR from akoDeploymentConfig
+	t1LR := "temp-t1LR"
 	if adc.Spec.ExtraConfigs.IngressConfigs.ShardVSSize != "" {
 		shardSize = adc.Spec.ExtraConfigs.IngressConfigs.ShardVSSize
 	}
@@ -341,6 +343,9 @@ func (r *AKODeploymentConfigReconciler) createAviInfraSetting(adc *akoov1alpha1.
 			L7Settings: akov1beta1.AviInfraL7Settings{
 				ShardSize: shardSize,
 			},
+			NSXSettings: akov1beta1.AviInfraNSXSettings{
+				T1LR: &t1LR,
+			},
 		},
 	}
 }

diff --git a/controllers/cluster/cluster_controller.go b/controllers/cluster/cluster_controller.go
@@ -127,6 +127,7 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 // resources to the cluster
 func (r *ClusterReconciler) serviceToCluster(c client.Client, log logr.Logger) handler.MapFunc {
 	return func(ctx context.Context, o client.Object) []reconcile.Request {
+		ctx = context.Background()
 		service, ok := o.(*corev1.Service)
 		if !ok {
 			log.Error(errors.New("invalid type"),

diff --git a/pkg/handlers/cluster_for_akodeploymentconfig_handler.go b/pkg/handlers/cluster_for_akodeploymentconfig_handler.go
@@ -23,6 +23,7 @@ import (
 // resources to the AkoDeploymentConfig of this cluster
 func AkoDeploymentConfigForCluster(c client.Client, log logr.Logger) handler.MapFunc {
 	return func(ctx context.Context, o client.Object) []reconcile.Request {
+		ctx = context.Background()
 		cluster, ok := o.(*clusterv1.Cluster)
 		if !ok {
 			log.Error(errors.New("invalid type"),

diff --git a/pkg/handlers/cluster_for_machine_handler.go b/pkg/handlers/cluster_for_machine_handler.go
@@ -23,7 +23,7 @@ import (
 func MachinesForCluster(c client.Client, log logr.Logger) handler.MapFunc {
 
 	return func(ctx context.Context, o client.Object) []reconcile.Request {
-
+		ctx = context.Background()
 		cluster, ok := o.(*clusterv1.Cluster)
 		if !ok {
 			log.Error(errors.New("invalid type"),