diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3557143f8e6c2..045345da40633 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -589,7 +589,6 @@ repos: ^docs/apache-airflow-providers-amazon/secrets-backends/aws-ssm-parameter-store\.rst$| git| ^helm-tests/tests/chart_utils/helm_template_generator\.py$| - ^helm-tests/tests/chart_utils/ingress-networking-v1beta1\.json$| package-lock\.json$| ^.*\.(png|gif|jp[e]?g|svg|tgz|lock)$| ^\.pre-commit-config\.yaml$| diff --git a/helm-tests/tests/chart_utils/helm_template_generator.py b/helm-tests/tests/chart_utils/helm_template_generator.py index 0eca0a9f1a20b..fc78d83fa080b 100644 --- a/helm-tests/tests/chart_utils/helm_template_generator.py +++ b/helm-tests/tests/chart_utils/helm_template_generator.py @@ -48,10 +48,7 @@ crd_lookup = { # https://raw.githubusercontent.com/kedacore/keda/v2.0.0/config/crd/bases/keda.sh_scaledobjects.yaml - "keda.sh/v1alpha1::ScaledObject": f"{MY_DIR.as_posix()}/keda.sh_scaledobjects.yaml", - # This object type was removed in k8s v1.22.0 - # Retrieved from https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.21.0/ingress-networking-v1beta1.json - "networking.k8s.io/v1beta1::Ingress": f"{MY_DIR.as_posix()}/ingress-networking-v1beta1.json", + "keda.sh/v1alpha1::ScaledObject": f"{MY_DIR.as_posix()}/keda.sh_scaledobjects.yaml" } diff --git a/helm-tests/tests/chart_utils/ingress-networking-v1beta1.json b/helm-tests/tests/chart_utils/ingress-networking-v1beta1.json deleted file mode 100644 index 193343fbb4165..0000000000000 --- a/helm-tests/tests/chart_utils/ingress-networking-v1beta1.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "description": "Ingress is a collection of rules that allow inbound connections to reach the endpoints defined by a backend. An Ingress can be configured to give services externally-reachable urls, load balance traffic, terminate SSL, offer name based virtual hosting etc.", - "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", - "null" - ], - "enum": [ - "networking.k8s.io/v1beta1" - ] - }, - "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", - "null" - ], - "enum": [ - "Ingress" - ] - }, - "metadata": { - "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.21.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta", - "description": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata" - }, - "spec": { - "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.21.0/_definitions.json#/definitions/io.k8s.api.networking.v1beta1.IngressSpec", - "description": "Spec is the desired state of the Ingress. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status" - }, - "status": { - "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.21.0/_definitions.json#/definitions/io.k8s.api.networking.v1beta1.IngressStatus", - "description": "Status is the current state of the Ingress. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status" - } - }, - "type": "object", - "x-kubernetes-group-version-kind": [ - { - "group": "networking.k8s.io", - "kind": "Ingress", - "version": "v1beta1" - } - ], - "$schema": "http://json-schema.org/schema#" -}