f

Author: AlinsRan

charts/apisix-ingress-controller/README.md

@@ -142,14 +142,15 @@ The same for container level, you need to set:
 | deployment.topologySpreadConstraints | list | `[]` | Topology Spread Constraints for pod assignment spread across your cluster among failure-domains ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#spread-constraints-for-pods |
 | fullnameOverride | string | `""` |  |
 | gatewayProxy.createDefault | bool | `false` | Controls whether to create a default GatewayProxy custom resource. |
-| gatewayProxy.provider | object | `{"controlPlane":{"auth":{"adminKey":{"value":"edd1c9f034335f136f87ad84b625c8f1","valueFrom":{}},"type":"AdminKey"},"endpoints":[]},"pluginMetadata":{},"plugins":[],"type":"ControlPlane"}` | Configuration for the GatewayProxy provider connection |
-| gatewayProxy.provider.controlPlane | object | `{"auth":{"adminKey":{"value":"edd1c9f034335f136f87ad84b625c8f1","valueFrom":{}},"type":"AdminKey"},"endpoints":[]}` | ControlPlane provider specific configuration |
+| gatewayProxy.provider | object | `{"controlPlane":{"auth":{"adminKey":{"value":"edd1c9f034335f136f87ad84b625c8f1","valueFrom":{}},"type":"AdminKey"},"endpoints":[],"service":{"name":"","port":9180}},"pluginMetadata":{},"plugins":[],"type":"ControlPlane"}` | Configuration for the GatewayProxy provider connection |
+| gatewayProxy.provider.controlPlane | object | `{"auth":{"adminKey":{"value":"edd1c9f034335f136f87ad84b625c8f1","valueFrom":{}},"type":"AdminKey"},"endpoints":[],"service":{"name":"","port":9180}}` | ControlPlane provider specific configuration Either `endpoints` or `service` must be specified, but not both. |
 | gatewayProxy.provider.controlPlane.auth | object | `{"adminKey":{"value":"edd1c9f034335f136f87ad84b625c8f1","valueFrom":{}},"type":"AdminKey"}` | Authentication configuration for control plane connection |
 | gatewayProxy.provider.controlPlane.auth.adminKey | object | `{"value":"edd1c9f034335f136f87ad84b625c8f1","valueFrom":{}}` | AdminKey authentication configuration. Either `value` or `valueFrom` must be specified, but not both. |
 | gatewayProxy.provider.controlPlane.auth.adminKey.value | string | `"edd1c9f034335f136f87ad84b625c8f1"` | The admin key value for authentication. |
 | gatewayProxy.provider.controlPlane.auth.adminKey.valueFrom | object | `{}` | Reference to admin key stored in a Kubernetes Secret |
 | gatewayProxy.provider.controlPlane.auth.type | string | `AdminKey` | Authentication type. Only `AdminKey` is currently supported. |
 | gatewayProxy.provider.controlPlane.endpoints | list | `[]` | List of APISIX control plane Admin API endpoints. example: ["http://apisix-admin.default.svc.cluster.local:9180"] |
+| gatewayProxy.provider.controlPlane.service | object | `{"name":"","port":9180}` | Alternatively, reference a Kubernetes Service for the APISIX Admin API. |
 | gatewayProxy.provider.pluginMetadata | object | `{}` | Global plugin metadata shared by all instances of the same plugin. |
 | gatewayProxy.provider.plugins | list | `[]` | List of global plugins to be enabled on the GatewayProxy. |
 | gatewayProxy.provider.type | string | `"ControlPlane"` | Specifies the provider type for the GatewayProxy. |

charts/apisix-ingress-controller/templates/gatewayproxy.yaml

@@ -24,16 +24,18 @@ spec:
   provider:
     type: {{ .Values.gatewayProxy.provider.type }}
     controlPlane:
-      {{- with .Values.gatewayProxy.provider.controlPlane.endpoints }}
-      {{- if (gt (len .) 0) }}
+      {{- if .Values.gatewayProxy.provider.controlPlane.endpoints }}
       endpoints:
-      {{- toYaml . | nindent 8 }}
+        {{- toYaml .Values.gatewayProxy.provider.controlPlane.endpoints | nindent 8 }}
+      {{- else if .Values.gatewayProxy.provider.controlPlane.service.name }}
+      service:
+        name: {{ .Values.gatewayProxy.provider.controlPlane.service.name }}
+        port: {{ .Values.gatewayProxy.provider.controlPlane.service.port }}
       {{- else }}
       service:
         name: {{ .Values.apisix.adminService.name }}
         port: {{ .Values.apisix.adminService.port }}
       {{- end }}
-      {{- end }}
 
       {{- with .Values.gatewayProxy.provider.controlPlane.tlsVerify }}
       tlsVerify: {{ . }}

charts/apisix-ingress-controller/values.yaml

@@ -104,13 +104,19 @@ gatewayProxy:
   provider:
     # -- Specifies the provider type for the GatewayProxy.
     type: ControlPlane
-    
+
     # -- ControlPlane provider specific configuration
+    # Either `endpoints` or `service` must be specified, but not both.
     controlPlane:
       # -- List of APISIX control plane Admin API endpoints.
       # example: ["http://apisix-admin.default.svc.cluster.local:9180"]
       endpoints: []
 
+      # -- Alternatively, reference a Kubernetes Service for the APISIX Admin API.
+      service:
+        name: ""
+        port: 9180
+
       # -- Authentication configuration for control plane connection
       auth:
         # -- Authentication type. Only `AdminKey` is currently supported.
@@ -126,9 +132,7 @@ gatewayProxy:
           # -- Reference to admin key stored in a Kubernetes Secret
           valueFrom: {}
             # secretKeyRef:
-            #   # -- Name of the Secret containing the admin key
             #   name: apisix-admin-secret
-            #   # -- Key within the Secret containing the admin key value
             #   key: admin-key
 
     # -- List of global plugins to be enabled on the GatewayProxy.