Custom ingress annotation

[Baboulinet-33]

Hello,

I want to add this annotation on ingress generated by services in onyxia:

k8s.apisix.apache.org/enable-websocket: true

I've tried the solution in this issue: #1028 and ended with the following values.yaml:

onyxia:
  ingress:
    enabled: true
    ingressClassName: "nginx"
    annotations:
      cert-manager.io/cluster-issuer: letsencrypt
      k8s.apisix.apache.org/enable-websocket: "true"
    hosts:
      - host: onyxia.test.com
    tls:
      - secretName: onyxia-test-com
        hosts:
          - onyxia.test.com
  api:
    regions:
      [
        {
          id: "default",
          name: "default",
          location: { lat: 48.864716, longitude: 2.349014, name: "Paris" },
          description: "Default",
          services:
            {
              namespaceAnnotationsDynamic":
                { enabled: true, userAttributes: ["email"] },
              quotas:
                {
                  userEnabled: true,
                  groupEnabled: false,
                  allowUserModification: false,
                  user:
                    {
                      "count/pods": 100,
                      "requests.memory": "32Gi",
                      "requests.cpu": "16000m",
                      "limits.memory": "32Gi",
                      "limits.cpu": "16000m",
                      "requests.storage": "500Gi",
                    },
                },
              type: "KUBERNETES",
              singleNamespace: false,
              authenticationMode: "serviceAccount",
              expose:
                {
                  domain: "onyxia.test.com",
                  route: false,
                  ingress: true,
                },
            },
        },
      ]
    catalogs:
      [
        {
          "id": "ide",
          "name": "Environnement de développement (conteneurs)",
          "description": "Services de développement interactifs en conteneurs",
          "maintainer": "aaa@aaa.fr",
          "location": "https://inseefrlab.github.io/helm-charts-interactive-services",
          "status": "PROD",
          "type": "helm",
          "skipTlsVerify": false,
        },
      ]
    schemas:
      enabled: true
      files:
        - relativePath: ide/ingress.json
          content: |
            {
              "$schema": "http://json-schema.org/draft-07/schema#",
              "title": "Configuration for ingress",
              "type": "object",
              "properties": {
                "annotations": {
                  "type": "object",
                  "default": {
                    "k8s.apisix.apache.org/enable-websocket": true
                  }
                }
              }
            }

But the schemas override completely the ingress generated by the service.

ingress:
  annotations:
    k8s.apisix.apache.org/enable-websocket: true

instead of:

ingress:
  certManagerClusterIssuer: ""
  enabled: true
  hostname: user-aaaaaaa-0.onyxia.test.com
  ingressClassName: ""
  useCertManager: false
  userHostname: user-aaaaaaa-user.onyxia.test.com

How can I add the apisix annotation ?

[Baboulinet-33]

And second question, how to use gatewai api instead of ingress for the generated services ?

[Bafbi]

And second question, how to use gatewai api instead of ingress for the generated services ?

Is being work on #1062

[fcomte]

Hello @Baboulinet-33

Indeed you have to put copy the whole schema for ide/ingress.json
There is no differential feature for schema override. We could have specify a dedicated overwriteSchema on ide/ingress-annotation.json but we did not on the opensource charts for ide.