feat: add separate chart for CRDs

.github/workflows/ci.yaml

@@ -37,7 +37,8 @@ jobs:
                   --validate-maintainers=false \
                   --charts charts/apisix \
                   --charts charts/apisix-dashboard \
-                  --charts charts/apisix-ingress-controller'
+                  --charts charts/apisix-ingress-controller \
+                  --charts charts/apisix-crds'
 
       - name: fix permissions
         run: |

charts/apisix-crds/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/apisix-crds/Chart.yaml

@@ -0,0 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+apiVersion: v2
+name: apisix-crds
+description: CRDs for Apache APISIX Ingress Controller for Kubernetes
+icon: https://apache.org/logos/res/apisix/apisix.png
+keywords:
+  - ingress
+  - apisix
+  - nginx
+  - crd
+type: application
+version: 1.0.0
+sources:
+  - https://github.com/apache/apisix-helm-chart

charts/apisix-crds/README.md

@@ -0,0 +1,15 @@
+# CRDs for Apache APISIX ingress controller
+
+You can use this chart to install the CRDs outside of the APISIX Ingress controller chart.
+Ensure that you use the `--skip-crds` flag when installing the APISIX Ingress controller chart.
+
+The Gateway API CRDs will not be installed by default; set the `gatewayApi.enabled` value to `true` to install them.
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| gatewayApi.channel | string | `"standard"` | The Gateway API channel to use. |
+| gatewayApi.enabled | bool | `false` | Whether or not the Gateway API CRDs will be installed. |
+| gatewayApi.verify.experimental | string | `"d3c20dd4c0431936567a6917ca931f6dced1310242be62b9eca07bd9892e2025"` | Gateway API Experimental channel install bundle sha256 hash |
+| gatewayApi.verify.standard | string | `"daa2999f0978ba3e43b65fec179f82a1a690649da10aa5c7c5871165477368f8"` | Gateway API Standard channel install bundle sha256 hash |

charts/apisix-crds/README.md.gotmpl

@@ -0,0 +1,8 @@
+# CRDs for Apache APISIX ingress controller
+
+You can use this chart to install the CRDs outside of the APISIX Ingress controller chart.
+Ensure that you use the `--skip-crds` flag when installing the APISIX Ingress controller chart.
+
+The Gateway API CRDs will not be installed by default; set the `gatewayApi.enabled` value to `true` to install them.
+
+{{ template "chart.valuesSection" . }}

charts/apisix-crds/templates/apisixic-crds.yaml

@@ -0,0 +1 @@
+../../apisix-ingress-controller/crds/apisixic-crds.yaml

charts/apisix-crds/templates/gatewayapi-crds.yaml

@@ -0,0 +1,11 @@
+{{- $root := $ -}}
+{{- with $root.Values.gatewayApi -}}
+  {{- if and (hasKey . "enabled") (kindIs "bool" .enabled) .enabled -}}
+    {{- $channel := .channel | default "standard" -}}
+    {{- $hash := dig "verify" $channel "" . -}}
+    {{- $bundle := printf "gateway-api-crds/%s-install.yaml" $channel -}}
+    {{- if eq $hash ($root.Files.Get $bundle | sha256sum) -}}
+      {{- $root.Files.Get $bundle -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}

charts/apisix-crds/values.yaml

@@ -0,0 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+gatewayApi:
+  # -- Whether or not the Gateway API CRDs will be installed.
+  enabled: false
+  # -- The Gateway API channel to use.
+  channel: standard
+  # channel: experimental
+  verify:
+    # https://github.com/kubernetes-sigs/gateway-api/releases/tag/v1.4.1
+    # -- Gateway API Standard channel install bundle sha256 hash
+    standard: daa2999f0978ba3e43b65fec179f82a1a690649da10aa5c7c5871165477368f8
+    # -- Gateway API Experimental channel install bundle sha256 hash
+    experimental: d3c20dd4c0431936567a6917ca931f6dced1310242be62b9eca07bd9892e2025