Skip to content

Feature/add servicemonitor to helm chart #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Michael Vittrup Larsen (michaelvl) merged 3 commits into from
Jun 14, 2023
Merged

Feature/add servicemonitor to helm chart #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1e243e
Add ServiceMonitor and test deployments
michaelvl Jun 13, 2023
6481665
Update chart CHANGELOG with PR info
michaelvl Jun 13, 2023
2c0b74a
Update helm docs
michaelvl Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions Makefile.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,16 @@ deploy-multitool:
deploy-external-dns:
helm upgrade -i --repo https://kubernetes-sigs.github.io/external-dns external-dns external-dns --version 1.12.2 --values test-data/external-dns-values.yaml

#################
.PHONY: deploy-prometheus-operator-crds
deploy-prometheus-operator-crds:
helm upgrade -i --repo https://prometheus-community.github.io/helm-charts prometheus-operator-crds prometheus-operator-crds --version 4.0.2

#################
.PHONY: deploy-prometheus
deploy-prometheus:
helm upgrade -i --repo https://prometheus-community.github.io/helm-charts kube-prometheus-stack kube-prometheus-stack --version 46.8.0 -n default --values test-data/kube-prometheus-stack-values.yaml

#################
.PHONY: deploy-metrics-server
deploy-metrics-server:
Expand All @@ -114,7 +124,6 @@ deploy-metrics-server:
#################
.PHONY: deploy-kube-state-metrics
deploy-kube-state-metrics:
helm upgrade -i --repo https://prometheus-community.github.io/helm-charts prometheus-operator-crds prometheus-operator-crds --version 4.0.2
helm upgrade -i --repo https://prometheus-community.github.io/helm-charts kube-state-metrics kube-state-metrics --version 5.7.0 -n kube-system --values test-data/kube-state-metrics-values.yaml

#################
Expand Down Expand Up @@ -210,12 +219,16 @@ BIFROST_VERSION ?= 0.1.6
deploy-controller-helm:
helm upgrade -i bifrost-gateway-controller-helm oci://ghcr.io/tv2-oss/bifrost-gateway-controller-helm --version ${BIFROST_VERSION} --values charts/bifrost-gateway-controller/ci/gatewayclassblueprint-contour-istio-values.yaml -n bifrost-gateway-controller-system --create-namespace

.PHONY: deploy-controller-local-helm
deploy-controller-local-helm:
helm upgrade -i bifrost-gateway-controller-helm charts/bifrost-gateway-controller --values charts/bifrost-gateway-controller/ci/gatewayclassblueprint-contour-istio-values.yaml -n bifrost-gateway-controller-system --create-namespace --set prometheus.monitor.enabled=true

.PHONY: deploy-controller-aws-helm
deploy-controller-aws-helm:
helm upgrade -i bifrost-gateway-controller-helm oci://ghcr.io/tv2-oss/bifrost-gateway-controller-helm --version ${BIFROST_VERSION} --values charts/bifrost-gateway-controller/ci/gatewayclassblueprint-crossplane-aws-alb-values.yaml -n bifrost-gateway-controller-system --create-namespace

.PHONY: undeploy-controller
undeploy-controller:
.PHONY: undeploy-controller-helm
undeploy-controller-helm:
helm uninstall -n bifrost-gateway-controller-system bifrost-gateway-controller-helm

#################
Expand Down
1 change: 1 addition & 0 deletions charts/bifrost-gateway-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## [UNRELEASED]

- Example text, add your PR info according to example below below this line. Do not bump chart version in Chart.yaml unless a chart release will be made following your PR.
- Add ServiceMonitor CRD to enable metrics endpoint discovery and configuration ([#202](https://github.com/tv2-oss/bifrost-gateway-controller/pull/202)) [@michaelvl](https://github.com/michaelvl)

## [0.1.7]

Expand Down
7 changes: 3 additions & 4 deletions charts/bifrost-gateway-controller/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ Gateway API driven management of network infrastructure across Kubernetes and cl
| controllerManager.manager.resources.requests.memory | string | `"64Mi"` | |
| controllerManager.podAnnotations | object | `{}` | |
| controllerManager.replicas | int | `1` | |
| metricsService.ports[0].name | string | `"http"` | |
| metricsService.ports[0].port | int | `8080` | |
| metricsService.ports[0].protocol | string | `"TCP"` | |
| metricsService.type | string | `"ClusterIP"` | |
| prometheus | object | `{"monitor":{"enabled":false},"service":{"port":8080,"type":"ClusterIP"}}` | Prometheus metrics |
| prometheus.monitor | object | `{"enabled":false}` | Prometheus-operator ServiceMonitor metrics endpoint specification |
| prometheus.service | object | `{"port":8080,"type":"ClusterIP"}` | Metrics service specification |
| serviceAccount.annotations | object | `{}` | |
| serviceAccount.create | bool | `true` | |

Expand Down
6 changes: 4 additions & 2 deletions charts/bifrost-gateway-controller/templates/metrics-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ metadata:
control-plane: manager
{{- include "gateway-controller.labels" . | nindent 4 }}
spec:
type: {{ .Values.metricsService.type }}
type: {{ .Values.prometheus.service.type }}
selector:
control-plane: manager
{{- include "gateway-controller.selectorLabels" . | nindent 4 }}
ports:
{{- .Values.metricsService.ports | toYaml | nindent 2 -}}
- name: http
port: {{ .Values.prometheus.service.port }}
protocol: TCP
21 changes: 21 additions & 0 deletions charts/bifrost-gateway-controller/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{{- if .Values.prometheus.monitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "gateway-controller.fullname" . }}-manager-metrics
labels:
control-plane: manager
{{- include "gateway-controller.labels" . | nindent 4 }}
spec:
jobLabel: {{ .Release.Name }}
selector:
matchLabels:
control-plane: manager
{{- include "gateway-controller.selectorLabels" . | nindent 4 }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
endpoints:
- port: http
path: /metrics
{{- end }}
176 changes: 121 additions & 55 deletions charts/bifrost-gateway-controller/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,65 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"required": [
"controllerManager",
"serviceAccount",
"metricsService"
],
"$schema": "http://json-schema.org/schema#",
"type": "object",
"properties": {
"controllerManager": {
"required": [
"manager",
"annotations",
"replicas",
"deploymentStrategy"
],
"type": "object",
"properties": {
"annotations": {
"type": "object"
},
"deploymentStrategy": {
"type": "object",
"properties": {
"type": {
"type": "string"
}
}
},
"manager": {
"required": [
"image",
"resources",
"livenessProbe",
"readinessProbe"
],
"type": "object",
"properties": {
"image": {
"required": [
"repository",
"name",
"tag",
"pullPolicy"
],
"type": "object",
"properties": {
"repository": {
"name": {
"type": "string"
},
"name": {
"pullPolicy": {
"type": "string"
},
"tag": {
"repository": {
"type": "string"
},
"pullPolicy": {
"tag": {
"type": "string"
}
}
},
"resources": {
"type": "object"
},
"livenessProbe": {
"type": "object"
"type": "object",
"properties": {
"httpGet": {
"type": "object",
"properties": {
"path": {
"type": "string"
},
"port": {
"type": "integer"
}
}
},
"initialDelaySeconds": {
"type": "integer"
},
"periodSeconds": {
"type": "integer"
}
}
},
"logging": {
"required": [
"format",
"level"
],
"type": "object",
"properties": {
"format": {
"type": "string"
Expand All @@ -64,46 +69,107 @@
}
}
},
"readinessProbe": {
"type": "object"
},
"rbac": {
"type": "object",
"properties": {
"additionalPermissions": {
"type": "array"
}
}
},
"readinessProbe": {
"type": "object",
"properties": {
"httpGet": {
"type": "object",
"properties": {
"path": {
"type": "string"
},
"port": {
"type": "integer"
}
}
},
"initialDelaySeconds": {
"type": "integer"
},
"periodSeconds": {
"type": "integer"
}
}
},
"resources": {
"type": "object",
"properties": {
"limits": {
"type": "object",
"properties": {
"cpu": {
"type": "string"
},
"memory": {
"type": "string"
}
}
},
"requests": {
"type": "object",
"properties": {
"cpu": {
"type": "string"
},
"memory": {
"type": "string"
}
}
}
}
}
}
},
"annotationer": {
"podAnnotations": {
"type": "object"
},
"replicas": {
"type": "integer"
}
}
},
"prometheus": {
"type": "object",
"properties": {
"monitor": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
}
},
"deploymentStrategy": {
"service": {
"type": "object",
"required": [
"type"
]
"properties": {
"port": {
"type": "integer"
},
"type": {
"type": "string"
}
}
}
}
},
"serviceAccount": {
"type": "object",
"required": [
"create",
"annotations"
]
},
"metricsService": {
"type": "object",
"required": [
"ports",
"type"
]
"properties": {
"annotations": {
"type": "object"
},
"create": {
"type": "boolean"
}
}
}
}
}
13 changes: 8 additions & 5 deletions charts/bifrost-gateway-controller/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,12 @@ serviceAccount:
# Annotations to add to the service account
annotations: {}

metricsService:
ports:
- name: http
# -- Prometheus metrics
prometheus:
# -- Metrics service specification
service:
port: 8080
protocol: TCP
type: ClusterIP
type: ClusterIP
# -- Prometheus-operator ServiceMonitor metrics endpoint specification
monitor:
enabled: false
27 changes: 27 additions & 0 deletions test-data/kube-prometheus-stack-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
prometheus:
prometheusSpec:
serviceMonitorSelectorNilUsesHelmValues: false
alertmanager:
enabled: false
grafana:
enabled: false
kubernetesServiceMonitors:
enabled: false
kubeApiServer:
enabled: false
kubelet:
enabled: false
kubeControllerManager:
enabled: false
coreDns:
enabled: false
kubeEtcd:
enabled: false
kubeScheduler:
enabled: false
kubeProxy:
enabled: false
kubeStateMetrics:
enabled: false
nodeExporter:
enabled: false