Check controller name

wso2 · Feb 21, 2024 · 3145e3c · 3145e3c
1 parent 447598c
commit 3145e3c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/common-controller/internal/operator/controllers/dp/gatewayclass_controller.go b/common-controller/internal/operator/controllers/dp/gatewayclass_controller.go
@@ -46,6 +46,7 @@ const (
 
 var (
 	setReadiness sync.Once
+	wso2APKDefaultControllerName = "wso2.com/apk-gateway-default"
 )
 
 // GatewayClassReconciler reconciles a Gateway object
@@ -102,7 +103,11 @@ func (gatewayClassReconciler *GatewayClassReconciler) Reconcile(ctx context.Cont
 			RequeueAfter: time.Duration(1 * time.Second),
 		}, nil
 	}
-	gatewayClassReconciler.handleGatewayClassStatus(req.NamespacedName, constants.Create, []string{})
+	// Check whether the gateway class controller name refers to wso2 apk and update the status as accepted, if it is.
+	controllerName := string(gatewayClassDef.Spec.ControllerName)
+	if (controllerName == wso2APKDefaultControllerName) {
+		gatewayClassReconciler.handleGatewayClassStatus(req.NamespacedName, constants.Create, []string{})
+	}
 	return ctrl.Result{}, nil
 }
 

diff --git a/helm-charts/templates/data-plane/config-deployer/config-ds-configmap.yaml b/helm-charts/templates/data-plane/config-deployer/config-ds-configmap.yaml
@@ -30,7 +30,7 @@ data:
     keyFilePath = "/home/wso2apk/config-deployer/security/config.key"
     certFilePath = "/home/wso2apk/config-deployer/security/config.pem"
     [wso2.config_deployer_service.gatewayConfiguration]
-    name = {{ .Values.wso2.apk.dp.gateway.name | default "wso2-apk-default" }}
+    name = "{{ .Values.wso2.apk.dp.gateway.name | default "wso2-apk-default" }}"
     listenerName = "httpslistener"
 {{ include "generateVhosts" .Values.wso2.apk.dp.configdeployer.vhosts | indent 4 }}
 {{if and .Values.wso2.apk.dp.partitionServer .Values.wso2.apk.dp.partitionServer.enabled}}

diff --git a/helm-charts/templates/data-plane/gateway-components/adapter/gateway-class.yaml b/helm-charts/templates/data-plane/gateway-components/adapter/gateway-class.yaml
@@ -1,6 +1,10 @@
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
 metadata:
+  {{- if .Values.wso2.apk.dp.gatewayClass }}
   name: {{ .Values.wso2.apk.dp.gatewayClass.name | default "wso2-apk-default" }}
+  {{- else }}
+  name: "wso2-apk-default"
+  {{- end }}
 spec:
   controllerName: "wso2.com/apk-gateway-default"
diff --git a/helm-charts/templates/data-plane/gateway-components/adapter/gateway.yaml b/helm-charts/templates/data-plane/gateway-components/adapter/gateway.yaml
@@ -7,7 +7,11 @@ metadata:
   annotations:
     cert-manager.io/issuer: selfsigned-issuer
 spec:
+  {{- if .Values.wso2.apk.dp.gatewayClass }}
   gatewayClassName: {{ .Values.wso2.apk.dp.gatewayClass.name | default "wso2-apk-default" }}
+  {{- else }}
+  gatewayClassName: "wso2-apk-default"
+  {{- end }}
   listeners:
     {{ if and .Values.wso2.apk.dp.gateway.httpListener .Values.wso2.apk.dp.gateway.httpListener.enabled }}
     - name: httplistener