diff --git a/bitnami/kong/Chart.yaml b/bitnami/kong/Chart.yaml index 98364cdad..f50ec3b3a 100644 --- a/bitnami/kong/Chart.yaml +++ b/bitnami/kong/Chart.yaml @@ -34,4 +34,4 @@ name: kong sources: - https://github.com/bitnami/bitnami-docker-kong - https://konghq.com/ -version: 3.0.7 +version: 3.0.8 diff --git a/bitnami/kong/crds/custom-resource-definitions.yaml b/bitnami/kong/crds/custom-resource-definitions.yaml index bbde19907..33ec28055 100644 --- a/bitnami/kong/crds/custom-resource-definitions.yaml +++ b/bitnami/kong/crds/custom-resource-definitions.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1 +apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: kongconsumers.configuration.konghq.com @@ -10,16 +10,16 @@ spec: kind: KongConsumer plural: kongconsumers shortNames: - - kc + - kc additionalPrinterColumns: - - name: Username - type: string - description: Username of a Kong Consumer - JSONPath: .username - - name: Age - type: date - description: Age - JSONPath: .metadata.creationTimestamp + - name: Username + type: string + description: Username of a Kong Consumer + JSONPath: .username + - name: Age + type: date + description: Age + JSONPath: .metadata.creationTimestamp validation: openAPIV3Schema: properties: @@ -31,43 +31,10 @@ spec: type: array items: type: string + subresources: + status: {} --- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: kongcredentials.configuration.konghq.com -spec: - group: configuration.konghq.com - version: v1 - scope: Namespaced - names: - kind: KongCredential - plural: kongcredentials - additionalPrinterColumns: - - name: Credential-type - type: string - description: Type of credential - JSONPath: .type - - name: Age - type: date - description: Age - JSONPath: .metadata.creationTimestamp - - name: Consumer-Ref - type: string - description: Owner of the credential - JSONPath: .consumerRef - validation: - openAPIV3Schema: - required: - - consumerRef - - type - properties: - consumerRef: - type: string - type: - type: string ---- -apiVersion: apiextensions.k8s.io/v1 +apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: kongplugins.configuration.konghq.com @@ -79,30 +46,30 @@ spec: kind: KongPlugin plural: kongplugins shortNames: - - kp + - kp additionalPrinterColumns: - - name: Plugin-Type - type: string - description: Name of the plugin - JSONPath: .plugin - - name: Age - type: date - description: Age - JSONPath: .metadata.creationTimestamp - - name: Disabled - type: boolean - description: Indicates if the plugin is disabled - JSONPath: .disabled - priority: 1 - - name: Config - type: string - description: Configuration of the plugin - JSONPath: .config - priority: 1 + - name: Plugin-Type + type: string + description: Name of the plugin + JSONPath: .plugin + - name: Age + type: date + description: Age + JSONPath: .metadata.creationTimestamp + - name: Disabled + type: boolean + description: Indicates if the plugin is disabled + JSONPath: .disabled + priority: 1 + - name: Config + type: string + description: Configuration of the plugin + JSONPath: .config + priority: 1 validation: openAPIV3Schema: required: - - plugin + - plugin properties: plugin: type: string @@ -110,25 +77,40 @@ spec: type: boolean config: type: object + configFrom: + type: object + properties: + secretKeyRef: + required: + - name + - key + type: object + properties: + name: + type: string + key: + type: string run_on: type: string enum: - - first - - second - - all + - first + - second + - all protocols: type: array items: type: string enum: - - http - - https - - grpc - - grpcs - - tcp - - tls + - http + - https + - grpc + - grpcs + - tcp + - tls + subresources: + status: {} --- -apiVersion: apiextensions.k8s.io/v1 +apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: kongclusterplugins.configuration.konghq.com @@ -140,26 +122,26 @@ spec: kind: KongClusterPlugin plural: kongclusterplugins shortNames: - - kcp + - kcp additionalPrinterColumns: - - name: Plugin-Type - type: string - description: Name of the plugin - JSONPath: .plugin - - name: Age - type: date - description: Age - JSONPath: .metadata.creationTimestamp - - name: Disabled - type: boolean - description: Indicates if the plugin is disabled - JSONPath: .disabled - priority: 1 - - name: Config - type: string - description: Configuration of the plugin - JSONPath: .config - priority: 1 + - name: Plugin-Type + type: string + description: Name of the plugin + JSONPath: .plugin + - name: Age + type: date + description: Age + JSONPath: .metadata.creationTimestamp + - name: Disabled + type: boolean + description: Indicates if the plugin is disabled + JSONPath: .disabled + priority: 1 + - name: Config + type: string + description: Configuration of the plugin + JSONPath: .config + priority: 1 validation: openAPIV3Schema: required: @@ -171,25 +153,43 @@ spec: type: boolean config: type: object + configFrom: + type: object + properties: + secretKeyRef: + required: + - name + - namespace + - key + type: object + properties: + namespace: + type: string + name: + type: string + key: + type: string run_on: type: string enum: - - first - - second - - all + - first + - second + - all protocols: type: array items: type: string enum: - - http - - https - - grpc - - grpcs - - tcp - - tls + - http + - https + - grpc + - grpcs + - tcp + - tls + subresources: + status: {} --- -apiVersion: apiextensions.k8s.io/v1 +apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: kongingresses.configuration.konghq.com @@ -201,7 +201,7 @@ spec: kind: KongIngress plural: kongingresses shortNames: - - ki + - ki validation: openAPIV3Schema: properties: @@ -226,19 +226,19 @@ spec: path_handling: type: string enum: - - "v0" - - "v1" + - "v0" + - "v1" protocols: type: array items: type: string enum: - - http - - https - - grpc - - grpcs - - tcp - - tls + - http + - https + - grpc + - grpcs + - tcp + - tls https_redirect_status_code: type: integer proxy: @@ -247,12 +247,12 @@ spec: protocol: type: string enum: - - http - - https - - grpc - - grpcs - - tcp - - tls + - http + - https + - grpc + - grpcs + - tcp + - tls path: type: string pattern: ^/.*$ @@ -274,9 +274,9 @@ spec: algorithm: type: string enum: - - "round-robin" - - "consistent-hashing" - - "least-connections" + - "round-robin" + - "consistent-hashing" + - "least-connections" host_header: type: string hash_on: @@ -348,8 +348,10 @@ spec: properties: healthy: *healthy unhealthy: *unhealthy + subresources: + status: {} --- -apiVersion: apiextensions.k8s.io/v1 +apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: tcpingresses.configuration.konghq.com @@ -361,14 +363,14 @@ spec: kind: TCPIngress plural: tcpingresses additionalPrinterColumns: - - name: Address - type: string - description: Address of the load balancer - JSONPath: .status.loadBalancer.ingress[*].ip - - name: Age - type: date - description: Age - JSONPath: .metadata.creationTimestamp + - name: Address + type: string + description: Address of the load balancer + JSONPath: .status.loadBalancer.ingress[*].ip + - name: Age + type: date + description: Age + JSONPath: .metadata.creationTimestamp subresources: status: {} validation: @@ -414,6 +416,8 @@ spec: type: integer status: type: object + subresources: + status: {} status: acceptedNames: kind: "" diff --git a/bitnami/kong/values-production.yaml b/bitnami/kong/values-production.yaml index 30735eb18..b93113d3f 100644 --- a/bitnami/kong/values-production.yaml +++ b/bitnami/kong/values-production.yaml @@ -505,12 +505,6 @@ metrics: ## # serviceAccount: prometheus - # If RBAC enabled on the cluster, Additional resources will be required - # so Prometheus can reach kong's namespace - rbac: - enabled: true - - ## Interval at which metrics should be scraped. ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint ## @@ -527,6 +521,12 @@ metrics: # selector: # prometheus: my-prometheus + ## If RBAC enabled on the cluster, Additional resources will be required + ## so Prometheus can reach kong's namespace + ## + rbac: + enabled: true + ## Add an horizontal pod autoscaler ## ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ ## diff --git a/bitnami/kong/values.yaml b/bitnami/kong/values.yaml index 85262bb6e..e4c46cbb2 100644 --- a/bitnami/kong/values.yaml +++ b/bitnami/kong/values.yaml @@ -511,11 +511,6 @@ metrics: ## # serviceAccount: prometheus - # If RBAC enabled on the cluster, Additional resources will be required - # so Prometheus can reach kong's namespace - rbac: - enabled: true - ## Interval at which metrics should be scraped. ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint ## @@ -532,6 +527,12 @@ metrics: # selector: # prometheus: my-prometheus + ## If RBAC enabled on the cluster, Additional resources will be required + ## so Prometheus can reach kong's namespace + ## + rbac: + enabled: true + ## Add an horizontal pod autoscaler ## ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ ##