From 341541d92c5be8266f5ee17cfe4cd312bd7a9cb7 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Mon, 22 Nov 2021 22:59:32 +0100 Subject: [PATCH] chore(prometheus): don't allow config of promop service and remove reminants --- charts/incubator/prometheus/Chart.yaml | 2 +- charts/incubator/prometheus/questions.yaml | 59 ---------------------- charts/incubator/prometheus/values.yaml | 47 ----------------- 3 files changed, 1 insertion(+), 107 deletions(-) diff --git a/charts/incubator/prometheus/Chart.yaml b/charts/incubator/prometheus/Chart.yaml index a26ae544ecb..a0b23d37ceb 100644 --- a/charts/incubator/prometheus/Chart.yaml +++ b/charts/incubator/prometheus/Chart.yaml @@ -20,7 +20,7 @@ sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus type: application -version: 0.0.5 +version: 0.0.6 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/incubator/prometheus/questions.yaml b/charts/incubator/prometheus/questions.yaml index 3ceb9aee617..d0780544f43 100644 --- a/charts/incubator/prometheus/questions.yaml +++ b/charts/incubator/prometheus/questions.yaml @@ -90,65 +90,6 @@ questions: type: int default: 9090 - - variable: promop - label: "Operator Service" - description: "The Primary service on which the healthcheck runs" - schema: - type: dict - attrs: -# Include{serviceSelector} - - variable: promop - label: "Operator Service Port Configuration" - schema: - type: dict - attrs: - - variable: port - label: "Port" - description: "This port exposes the container port on the service" - schema: - type: int - default: 10089 - required: true - - variable: advanced - label: "Show Advanced settings" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: enabled - label: "Enable the port" - schema: - type: boolean - default: true - - variable: protocol - label: "Port Type" - schema: - type: string - default: "HTTP" - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: nodePort - label: "Node Port (Optional)" - description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer" - schema: - type: int - min: 9000 - max: 65535 - - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" - schema: - type: int - default: 8080 - - variable: alertmanager label: "alertmanager Service" description: "alertmanager service " diff --git a/charts/incubator/prometheus/values.yaml b/charts/incubator/prometheus/values.yaml index 99ef3b2aa40..636c213d44a 100644 --- a/charts/incubator/prometheus/values.yaml +++ b/charts/incubator/prometheus/values.yaml @@ -907,53 +907,6 @@ alertmanager: enabled: false minAvailable: 1 maxUnavailable: "" - ## Alertmanager Service - ## - service: - ## @param alertmanager.service.type Kubernetes service type - ## - type: ClusterIP - ## @param alertmanager.service.port Alertmanager service port - ## - port: 9093 - ## @param alertmanager.service.clusterIP Specific cluster IP when service type is cluster IP. Use `None` for headless service - ## e.g: - ## clusterIP: None - ## - clusterIP: "" - ## @param alertmanager.service.nodePort Specify the nodePort value for the LoadBalancer and NodePort service types. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport - ## e.g: - ## nodePort: 30903 - ## - nodePort: "" - ## @param alertmanager.service.loadBalancerIP `loadBalancerIP` if service type is `LoadBalancer` - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer - ## - loadBalancerIP: "" - ## @param alertmanager.service.loadBalancerSourceRanges Address that are allowed when svc is `LoadBalancer` - ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service - ## e.g: - ## loadBalancerSourceRanges: - ## - 10.10.10.0/24 - ## - loadBalancerSourceRanges: [] - ## @param alertmanager.service.externalTrafficPolicy Enable client source IP preservation - ## Denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints - ## There are two available options: Cluster (default) and Local. - ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip - ## - externalTrafficPolicy: Cluster - ## @param alertmanager.service.healthCheckNodePort Specifies the health check node port - ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip - ## - healthCheckNodePort: "" - ## @param alertmanager.service.stickySessions Set stickySessions to `true` to enable Session Affinity - ## - stickySessions: "" - ## @param alertmanager.service.annotations Additional annotations for Alertmanager service (this value is evaluated as a template) - ## - annotations: {} ## If true, create a serviceMonitor for alertmanager ## serviceMonitor: