feat: deploy a default GatewayClass

Signed-off-by: Lin Yang <reaver@flomesh.io>
flomesh-io · May 17, 2023 · 064a48d · 064a48d
1 parent 95f5991
commit 064a48d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/charts/fsm/templates/crds-configmap.yaml b/charts/fsm/templates/crds-configmap.yaml
@@ -12,11 +12,11 @@ data:
 {{ (.Files.Get "apis/flomesh.io_proxyprofiles.yaml") | indent 4 }}
   flomesh.io_mcs-api.yaml: |
 {{ (.Files.Get "apis/flomesh.io_mcs-api.yaml") | indent 4 }}
-  {{- if and .Values.fsm.gatewayApi.enabled (not .Values.fsm.ingress.enabled )}}
+  {{- if and .Values.fsm.gatewayApi.enabled (not .Values.fsm.ingress.enabled ) (semverCompare ">=1.21-0" .Capabilities.KubeVersion.GitVersion) }}
   gateway-api.yaml: |
 {{ (.Files.Get "apis/gateway-api.yaml") | indent 4 }}
   {{- end }}
-  {{- if and .Values.fsm.ingress.enabled .Values.fsm.ingress.namespaced (not .Values.fsm.gatewayApi.enabled) }}
+  {{- if and .Values.fsm.ingress.enabled .Values.fsm.ingress.namespaced (not .Values.fsm.gatewayApi.enabled) (semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion) }}
   flomesh.io_namespacedingresses.yaml: |
 {{ (.Files.Get "apis/flomesh.io_namespacedingresses.yaml") | indent 4 }}
   {{- end }}
diff --git a/charts/fsm/templates/gateway-class.yaml b/charts/fsm/templates/gateway-class.yaml
@@ -0,0 +1,8 @@
+{{- if and .Values.fsm.gatewayApi.enabled (not .Values.fsm.ingress.enabled ) (semverCompare ">=1.21-0" .Capabilities.KubeVersion.GitVersion) }}
+apiVersion: gateway.networking.k8s.io/v1beta1
+kind: GatewayClass
+metadata:
+  name: fsm-gateway-cls
+spec:
+  controllerName: flomesh.io/gateway-controller
+{{- end }}
diff --git a/samples/gateway/README.md b/samples/gateway/README.md
@@ -17,7 +17,7 @@ cat <<EOF | kubectl apply -f -
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
 metadata:
-  name: flomesh-lb
+  name: fsm-gateway-cls
 spec:
   controllerName: flomesh.io/gateway-controller
 EOF
@@ -32,7 +32,7 @@ kind: Gateway
 metadata:
   name: test1
 spec:
-  gatewayClassName: flomesh-lb
+  gatewayClassName: fsm-gateway-cls
   listeners:
     - protocol: HTTP
       port: 8080