From d5e6f98ffb27daea63d9add451bc4b73d5d98708 Mon Sep 17 00:00:00 2001 From: "Han Verstraete (OpenFaaS Ltd)" <han@openfaas.com> Date: Fri, 20 Jan 2023 11:28:18 +0100 Subject: [PATCH] Update ingress-operator Signed-off-by: Han Verstraete (OpenFaaS Ltd) <han@openfaas.com> --- chart/openfaas/Chart.yaml | 2 +- .../templates/ingress-operator-crd.yaml | 122 ++++++++---------- chart/openfaas/values.yaml | 2 +- 3 files changed, 59 insertions(+), 67 deletions(-) diff --git a/chart/openfaas/Chart.yaml b/chart/openfaas/Chart.yaml index 4f7460de..363aeb94 100644 --- a/chart/openfaas/Chart.yaml +++ b/chart/openfaas/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 type: application description: OpenFaaS - Serverless Functions Made Simple name: openfaas -version: 11.1.7 +version: 11.1.8 sources: - https://github.com/openfaas/faas - https://github.com/openfaas/faas-netes diff --git a/chart/openfaas/templates/ingress-operator-crd.yaml b/chart/openfaas/templates/ingress-operator-crd.yaml index 29ee69f5..fdecfe3d 100644 --- a/chart/openfaas/templates/ingress-operator-crd.yaml +++ b/chart/openfaas/templates/ingress-operator-crd.yaml @@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: functioningresses.openfaas.com spec: @@ -17,70 +17,62 @@ spec: singular: functioningress scope: Namespaced versions: - - name: v1alpha2 - schema: - openAPIV3Schema: - description: FunctionIngress describes an OpenFaaS function - type: object - required: - - spec - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: FunctionIngressSpec is the spec for a FunctionIngress resource. - It must be created in the same namespace as the gateway, i.e. openfaas. - type: object - required: - - domain - - function - properties: - bypassGateway: - description: BypassGateway, when true creates an Ingress record directly - for the Function name without using the gateway in the hot path - type: boolean - domain: - description: Domain such as "api.example.com" - type: string - function: - description: Function such as "nodeinfo" - type: string - ingressType: - description: IngressType such as "nginx" - type: string - path: - description: Path such as "/v1/profiles/view/(.*)", or leave empty - for default - type: string - tls: - description: Enable TLS via cert-manager - type: object - properties: - enabled: - type: boolean - issuerRef: - description: ObjectReference is a reference to an object with - a given name and kind. - type: object - required: - - name - properties: - kind: - type: string - name: - type: string - served: true - storage: true + - name: v1 + schema: + openAPIV3Schema: + description: FunctionIngress describes an OpenFaaS function + type: object + required: + - spec + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: FunctionIngressSpec is the spec for a FunctionIngress resource. It must be created in the same namespace as the gateway, i.e. openfaas. + type: object + required: + - domain + - function + properties: + bypassGateway: + description: BypassGateway, when true creates an Ingress record directly for the Function name without using the gateway in the hot path + type: boolean + domain: + description: Domain such as "api.example.com" + type: string + function: + description: Function such as "nodeinfo" + type: string + ingressType: + description: IngressType such as "nginx" + type: string + path: + description: Path such as "/v1/profiles/view/(.*)", or leave empty for default + type: string + tls: + description: Enable TLS via cert-manager + type: object + properties: + enabled: + type: boolean + issuerRef: + description: ObjectReference is a reference to an object with a given name and kind. + type: object + required: + - name + properties: + kind: + type: string + name: + type: string + served: true + storage: true status: acceptedNames: kind: "" diff --git a/chart/openfaas/values.yaml b/chart/openfaas/values.yaml index 8329cfae..59afc865 100644 --- a/chart/openfaas/values.yaml +++ b/chart/openfaas/values.yaml @@ -309,7 +309,7 @@ ingress: # ingressOperator (optional) – component to have specific FQDN and TLS for Functions # https://github.com/openfaas-incubator/ingress-operator ingressOperator: - image: ghcr.io/openfaas/ingress-operator:0.7.1 + image: ghcr.io/openfaas/ingress-operator:0.8.0 replicas: 1 create: false resources: -- GitLab