From a78418dd3008362135014bc33a6bf368016700ba Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Fri, 5 Apr 2024 08:49:23 -0400 Subject: [PATCH] helm/charts/alloy: update default listen port to 12345 This changes the default listen port to 12345 so it aligns with all other Alloy installations. --- operations/helm/charts/alloy/CHANGELOG.md | 3 ++- operations/helm/charts/alloy/README.md | 14 +++++++++++++- operations/helm/charts/alloy/README.md.gotmpl | 12 ++++++++++++ operations/helm/charts/alloy/values.yaml | 2 +- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/cluster_service.yaml | 4 ++-- .../alloy/templates/controllers/statefulset.yaml | 8 ++++---- .../tests/clustering/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../create-daemonset/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/deployment.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/deployment.yaml | 8 ++++---- .../create-deployment/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/statefulset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/statefulset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../custom-config/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../default-values/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../tests/envFrom/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../existing-config/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../tests/extra-env/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../tests/extra-ports/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../faro-ingress/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../initcontainers/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../tests/nonroot/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../pod_annotations/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../tests/sidecars/alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/deployment.yaml | 8 ++++---- .../alloy/templates/service.yaml | 4 ++-- .../alloy/templates/controllers/daemonset.yaml | 8 ++++---- .../with-digests/alloy/templates/service.yaml | 4 ++-- 63 files changed, 204 insertions(+), 179 deletions(-) diff --git a/operations/helm/charts/alloy/CHANGELOG.md b/operations/helm/charts/alloy/CHANGELOG.md index 41dff46d15..20968bee90 100644 --- a/operations/helm/charts/alloy/CHANGELOG.md +++ b/operations/helm/charts/alloy/CHANGELOG.md @@ -14,4 +14,5 @@ internal API changes are not present. - Introduce a Grafana Alloy Helm chart. The Grafana Alloy Helm chart is backwards compatibile with the values.yaml from the `grafana-agent` Helm - chart. (@rfratto) + chart. Review the Helm chart README for a description on how to migrate. + (@rfratto) diff --git a/operations/helm/charts/alloy/README.md b/operations/helm/charts/alloy/README.md index 5a9c7fb7ad..c95818a175 100644 --- a/operations/helm/charts/alloy/README.md +++ b/operations/helm/charts/alloy/README.md @@ -44,7 +44,7 @@ useful if just using the default DaemonSet isn't sufficient. | alloy.extraEnv | list | `[]` | Extra environment variables to pass to the Alloy container. | | alloy.extraPorts | list | `[]` | Extra ports to expose on the Alloy container. | | alloy.listenAddr | string | `"0.0.0.0"` | Address to listen for traffic on. 0.0.0.0 exposes the UI to other containers. | -| alloy.listenPort | int | `80` | Port to listen for traffic on. | +| alloy.listenPort | int | `12345` | Port to listen for traffic on. | | alloy.listenScheme | string | `"HTTP"` | Scheme is needed for readiness probes. If enabling tls in your configs, set to "HTTPS" | | alloy.mounts.dockercontainers | bool | `false` | Mount /var/lib/docker/containers from the host into the container for log collection. | | alloy.mounts.extra | list | `[]` | Extra volume mounts to add into the Grafana Alloy container. Does not affect the watch container. | @@ -131,6 +131,18 @@ useful if just using the default DaemonSet isn't sufficient. | serviceMonitor.relabelings | list | `[]` | RelabelConfigs to apply to samples before scraping ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#relabelconfig | | serviceMonitor.tlsConfig | object | `{}` | Customize tls parameters for the service monitor | +#### Migrate from `grafana/grafana-agent` chart to `grafana/alloy` + +The `values.yaml` file for the `grafana/grafana-agent` chart is compatible with +the chart for `grafana/alloy`, with two exceptions: + +* The `agent` field in `values.yaml` is deprecated in favor of `alloy`. Support + for the `agent` field will be removed in a future release. + +* The default value for `alloy.listenPort` is `12345` to align with the default + listen port in other installations. To retain the previous default, set + `alloy.listenPort` to `80` when installing. + ### alloy.extraArgs `alloy.extraArgs` allows for passing extra arguments to the Grafana Alloy diff --git a/operations/helm/charts/alloy/README.md.gotmpl b/operations/helm/charts/alloy/README.md.gotmpl index b483578f5e..acef40ad2b 100644 --- a/operations/helm/charts/alloy/README.md.gotmpl +++ b/operations/helm/charts/alloy/README.md.gotmpl @@ -31,6 +31,18 @@ useful if just using the default DaemonSet isn't sufficient. {{ template "chart.valuesSection" . }} +#### Migrate from `grafana/grafana-agent` chart to `grafana/alloy` + +The `values.yaml` file for the `grafana/grafana-agent` chart is compatible with +the chart for `grafana/alloy`, with two exceptions: + +* The `agent` field in `values.yaml` is deprecated in favor of `alloy`. Support + for the `agent` field will be removed in a future release. + +* The default value for `alloy.listenPort` is `12345` to align with the default + listen port in other installations. To retain the previous default, set + `alloy.listenPort` to `80` when installing. + ### alloy.extraArgs `alloy.extraArgs` allows for passing extra arguments to the Grafana Alloy diff --git a/operations/helm/charts/alloy/values.yaml b/operations/helm/charts/alloy/values.yaml index bb3c3529dd..b5cbc065c0 100644 --- a/operations/helm/charts/alloy/values.yaml +++ b/operations/helm/charts/alloy/values.yaml @@ -49,7 +49,7 @@ alloy: listenAddr: 0.0.0.0 # -- Port to listen for traffic on. - listenPort: 80 + listenPort: 12345 # -- Scheme is needed for readiness probes. If enabling tls in your configs, set to "HTTPS" listenScheme: HTTP diff --git a/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml index d51e15b59d..91e8ec7fe8 100644 --- a/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/additional-serviceaccount-label/alloy/templates/service.yaml b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/additional-serviceaccount-label/alloy/templates/service.yaml +++ b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/clustering/alloy/templates/cluster_service.yaml b/operations/helm/tests/clustering/alloy/templates/cluster_service.yaml index b7dd21b837..cf7242b4b0 100644 --- a/operations/helm/tests/clustering/alloy/templates/cluster_service.yaml +++ b/operations/helm/tests/clustering/alloy/templates/cluster_service.yaml @@ -24,6 +24,6 @@ spec: # This service should only be used for clustering, and not metric # collection. - name: http - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml index 209ea18180..7ecd5e1fe7 100644 --- a/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml @@ -36,7 +36,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ - --cluster.enabled=true - --cluster.join-addresses=alloy-cluster @@ -48,12 +48,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -64,7 +64,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/clustering/alloy/templates/service.yaml b/operations/helm/tests/clustering/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/clustering/alloy/templates/service.yaml +++ b/operations/helm/tests/clustering/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml index 680906690c..52f97e8cb3 100644 --- a/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -62,7 +62,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/controller-volumes-extra/alloy/templates/service.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/controller-volumes-extra/alloy/templates/service.yaml +++ b/operations/helm/tests/controller-volumes-extra/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml index 636c0e9597..09fb576465 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/service.yaml b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/service.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml index d51e15b59d..91e8ec7fe8 100644 --- a/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/create-daemonset/alloy/templates/service.yaml b/operations/helm/tests/create-daemonset/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/create-daemonset/alloy/templates/service.yaml +++ b/operations/helm/tests/create-daemonset/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml index fe63ed1ab9..129d248436 100644 --- a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -62,7 +62,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/service.yaml b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/service.yaml +++ b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml index 8781b7dc51..2b8b0869dd 100644 --- a/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml @@ -34,7 +34,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -44,12 +44,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -60,7 +60,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/create-deployment/alloy/templates/service.yaml b/operations/helm/tests/create-deployment/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/create-deployment/alloy/templates/service.yaml +++ b/operations/helm/tests/create-deployment/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml index d32be237f2..61ab99663c 100644 --- a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml @@ -35,7 +35,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -45,12 +45,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -64,7 +64,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/service.yaml b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/service.yaml +++ b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml index e0d5af1402..23ae00ad9d 100644 --- a/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml @@ -36,7 +36,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -46,12 +46,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -62,7 +62,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/create-statefulset/alloy/templates/service.yaml b/operations/helm/tests/create-statefulset/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/create-statefulset/alloy/templates/service.yaml +++ b/operations/helm/tests/create-statefulset/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml index d51e15b59d..91e8ec7fe8 100644 --- a/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/custom-config/alloy/templates/service.yaml b/operations/helm/tests/custom-config/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/custom-config/alloy/templates/service.yaml +++ b/operations/helm/tests/custom-config/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml index d51e15b59d..91e8ec7fe8 100644 --- a/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/default-values/alloy/templates/service.yaml b/operations/helm/tests/default-values/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/default-values/alloy/templates/service.yaml +++ b/operations/helm/tests/default-values/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml index 354b65f689..da473b60a0 100644 --- a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTPS initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/service.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/service.yaml +++ b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml index d51e15b59d..91e8ec7fe8 100644 --- a/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/service.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/enable-servicemonitor/alloy/templates/service.yaml +++ b/operations/helm/tests/enable-servicemonitor/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml index 02412907fd..d22213e869 100644 --- a/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -46,12 +46,12 @@ spec: - configMapRef: name: special-config ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -62,7 +62,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/envFrom/alloy/templates/service.yaml b/operations/helm/tests/envFrom/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/envFrom/alloy/templates/service.yaml +++ b/operations/helm/tests/envFrom/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml index b821223211..da0a0c5316 100644 --- a/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/my-config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/existing-config/alloy/templates/service.yaml b/operations/helm/tests/existing-config/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/existing-config/alloy/templates/service.yaml +++ b/operations/helm/tests/existing-config/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml index be727ffb6d..1a2c58424e 100644 --- a/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -52,12 +52,12 @@ spec: name: NAME value: Kubernetes ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -68,7 +68,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/extra-env/alloy/templates/service.yaml b/operations/helm/tests/extra-env/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/extra-env/alloy/templates/service.yaml +++ b/operations/helm/tests/extra-env/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml index ec92911108..429eb74b99 100644 --- a/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,7 +43,7 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics - containerPort: 14268 name: jaeger-thrift @@ -51,7 +51,7 @@ spec: readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -62,7 +62,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/extra-ports/alloy/templates/service.yaml b/operations/helm/tests/extra-ports/alloy/templates/service.yaml index e4fc0125bb..b134bbbb0e 100644 --- a/operations/helm/tests/extra-ports/alloy/templates/service.yaml +++ b/operations/helm/tests/extra-ports/alloy/templates/service.yaml @@ -18,8 +18,8 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" - name: jaeger-thrift port: 14268 diff --git a/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml index 473be4f01c..2a652045df 100644 --- a/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,7 +43,7 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics - containerPort: 12347 name: faro @@ -51,7 +51,7 @@ spec: readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -62,7 +62,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/faro-ingress/alloy/templates/service.yaml b/operations/helm/tests/faro-ingress/alloy/templates/service.yaml index 18c045acff..fc3c7b3429 100644 --- a/operations/helm/tests/faro-ingress/alloy/templates/service.yaml +++ b/operations/helm/tests/faro-ingress/alloy/templates/service.yaml @@ -18,8 +18,8 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" - name: faro port: 12347 diff --git a/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml index 27969ff756..6a53cfb6f1 100644 --- a/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml @@ -38,7 +38,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -48,12 +48,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -64,7 +64,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/global-image-pullsecrets/alloy/templates/service.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/global-image-pullsecrets/alloy/templates/service.yaml +++ b/operations/helm/tests/global-image-pullsecrets/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml index 804a22a9b8..5173f6efd1 100644 --- a/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: quay.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/global-image-registry/alloy/templates/service.yaml b/operations/helm/tests/global-image-registry/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/global-image-registry/alloy/templates/service.yaml +++ b/operations/helm/tests/global-image-registry/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml index 1222e76b02..0981a7f516 100644 --- a/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml @@ -51,7 +51,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -61,12 +61,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -80,7 +80,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/initcontainers/alloy/templates/service.yaml b/operations/helm/tests/initcontainers/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/initcontainers/alloy/templates/service.yaml +++ b/operations/helm/tests/initcontainers/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml index 0572d22f96..c178bb95f9 100644 --- a/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml @@ -35,7 +35,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -45,12 +45,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -61,7 +61,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/local-image-pullsecrets/alloy/templates/service.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/local-image-pullsecrets/alloy/templates/service.yaml +++ b/operations/helm/tests/local-image-pullsecrets/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml index 804a22a9b8..5173f6efd1 100644 --- a/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: quay.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/local-image-registry/alloy/templates/service.yaml b/operations/helm/tests/local-image-registry/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/local-image-registry/alloy/templates/service.yaml +++ b/operations/helm/tests/local-image-registry/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml index 7513e7685f..26d0b7f79c 100644 --- a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/service.yaml b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/service.yaml +++ b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml index 7218ef918a..e390b9538c 100644 --- a/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml @@ -35,7 +35,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -45,12 +45,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -64,7 +64,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/nonroot/alloy/templates/service.yaml b/operations/helm/tests/nonroot/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/nonroot/alloy/templates/service.yaml +++ b/operations/helm/tests/nonroot/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml index fc722deac7..93b888fec6 100644 --- a/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml @@ -34,7 +34,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -44,12 +44,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -60,7 +60,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/pod_annotations/alloy/templates/service.yaml b/operations/helm/tests/pod_annotations/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/pod_annotations/alloy/templates/service.yaml +++ b/operations/helm/tests/pod_annotations/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml index 2a2e1bf445..9cfcaf5c42 100644 --- a/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -62,7 +62,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/sidecars/alloy/templates/service.yaml b/operations/helm/tests/sidecars/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/sidecars/alloy/templates/service.yaml +++ b/operations/helm/tests/sidecars/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml index 4fd5fa2609..219b36e5b0 100644 --- a/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml @@ -34,7 +34,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -44,12 +44,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -60,7 +60,7 @@ spec: image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/topologyspreadconstraints/alloy/templates/service.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/topologyspreadconstraints/alloy/templates/service.yaml +++ b/operations/helm/tests/topologyspreadconstraints/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP" diff --git a/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml index 573b045ad7..1463958783 100644 --- a/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml @@ -33,7 +33,7 @@ spec: - run - /etc/alloy/config.alloy - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 + - --server.http.listen-addr=0.0.0.0:12345 - --server.http.ui-path-prefix=/ env: - name: ALLOY_DEPLOY_MODE @@ -43,12 +43,12 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 80 + - containerPort: 12345 name: http-metrics readinessProbe: httpGet: path: /-/ready - port: 80 + port: 12345 scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 @@ -59,7 +59,7 @@ spec: image: docker.io/jimmidyson/configmap-reload@sha256:5af9d3041d12a3e63f115125f89b66d2ba981fe82e64302ac370c5496055059c args: - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload + - --webhook-url=http://localhost:12345/-/reload volumeMounts: - name: config mountPath: /etc/alloy diff --git a/operations/helm/tests/with-digests/alloy/templates/service.yaml b/operations/helm/tests/with-digests/alloy/templates/service.yaml index 34c0608fd3..5ad4e6c411 100644 --- a/operations/helm/tests/with-digests/alloy/templates/service.yaml +++ b/operations/helm/tests/with-digests/alloy/templates/service.yaml @@ -18,6 +18,6 @@ spec: internalTrafficPolicy: Cluster ports: - name: http-metrics - port: 80 - targetPort: 80 + port: 12345 + targetPort: 12345 protocol: "TCP"