Merge pull request #2178 from fluxcd/update-components

Update toolkit components
2026-03-01 19:26:55 +00:00 · 2021-12-09 21:00:42 +02:00 · 2021-12-09 17:24:34 +00:00 · 2021-12-09 18:23:53 +01:00 · 2021-12-09 17:35:53 +01:00 · 2021-12-09 17:59:19 +02:00
17 changed files with 338 additions and 273 deletions
--- a/.github/runners/README.md
+++ b/.github/runners/README.md
@@ -1,42 +1,72 @@
-# Flux GitHub runners
+# Flux ARM64 GitHub runners

-How to provision GitHub Actions self-hosted runners for Flux conformance testing.
+The Flux ARM64 end-to-end tests run on Equinix instances provisioned with Docker and GitHub self-hosted runners.

-## ARM64 Instance specs
+## Current instances
+
+| Runner        | Instance            | Region |
+|---------------|---------------------|--------|
+| equinix-arm-1 | flux-equinix-arm-01 | AMS1   |
+| equinix-arm-2 | flux-equinix-arm-01 | AMS1   |
+| equinix-arm-3 | flux-equinix-arm-01 | AMS1   |
+| equinix-arm-4 | flux-equinix-arm-02 | DFW2   |
+| equinix-arm-5 | flux-equinix-arm-02 | DFW2   |
+| equinix-arm-6 | flux-equinix-arm-02 | DFW2   |
+
+## Instance setup

 In order to add a new runner to the GitHub Actions pool,
-first create an instance on Oracle Cloud with the following configuration:
- OS: Canonical Ubuntu 20.04
- Shape: VM.Standard.A1.Flex
- OCPU Count: 2 
- Memory (GB): 12
- Network Bandwidth (Gbps): 2
- Local Disk: Block Storage Only  
+first create a server on Equinix with the following configuration:
+- Type: c2.large.arm
+- OS: Ubuntu 20.04

-Note that the instance image source must be **Canonical Ubuntu** instead of the default Oracle Linux.
-
-## ARM64 Instance setup
+### Install prerequisites

 - SSH into a newly created instance
 ```shell
-ssh ubuntu@<instance-public-IP>
+ssh root@<instance-public-IP>
 ``` 
- Create the action runner dir
+
+- Create the ubuntu user
 ```shell
-mkdir -p actions-runner && cd actions-runner
+adduser ubuntu
+usermod -aG sudo ubuntu
+su - ubuntu
 ```
- Download the provisioning script
+
+- Create the prerequisites dir
 ```shell
-curl -sL https://raw.githubusercontent.com/fluxcd/flux2/main/.github/runners/arm64.sh > arm64.sh \
-  && chmod +x ./arm64.sh
+mkdir -p prereq && cd prereq
 ```
+
+- Download the prerequisites script
+```shell
+curl -sL https://raw.githubusercontent.com/fluxcd/flux2/main/.github/runners/prereq.sh > prereq.sh \
+  && chmod +x ./prereq.sh
+```
+
+- Install the prerequisites
+```shell
+sudo ./prereq.sh
+```
+
+### Install runners
+
 - Retrieve the GitHub runner token from the repository [settings page](https://github.com/fluxcd/flux2/settings/actions/runners/new?arch=arm64&os=linux)
- Run the provisioning script passing the token as the first argument
+
+- Create 3 directories `runner1`, `runner2`, `runner3`
+
+- In each dir run:
 ```shell
-sudo ./arm64.sh <TOKEN>
+curl -sL https://raw.githubusercontent.com/fluxcd/flux2/main/.github/runners/runner-setup.sh > runner-setup.sh \
+  && chmod +x ./runner-setup.sh
+
+./runner-setup.sh equinix-arm-<NUMBER> <TOKEN>
 ```
+
 - Reboot the instance
 ```shell
 sudo reboot
-```  
+```
+
 - Navigate to the GitHub repository [runners page](https://github.com/fluxcd/flux2/settings/actions/runners) and check the runner status
--- a/.github/runners/prereq.sh
+++ b/.github/runners/prereq.sh
@@ -14,19 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This script is meant to be run locally and in CI to validate the Kubernetes
-# manifests (including Flux custom resources) before changes are merged into
-# the branch synced by Flux in-cluster.
+# This script installs the prerequisites for running Flux end-to-end tests with Docker and GitHub self-hosted runners.

 set -eu

-REPOSITORY_TOKEN=$1
-REPOSITORY_URL=${2:-https://github.com/fluxcd/flux2}
-
 KIND_VERSION=0.11.1
 KUBECTL_VERSION=1.21.2
 KUSTOMIZE_VERSION=4.1.3
-GITHUB_RUNNER_VERSION=2.278.0
+GITHUB_RUNNER_VERSION=2.285.1
 PACKAGES="apt-transport-https ca-certificates software-properties-common build-essential libssl-dev gnupg lsb-release jq"

 # install prerequisites
@@ -64,10 +59,3 @@ curl -o actions-runner-linux-arm64.tar.gz -L https://github.com/actions/runner/r

 # install runner dependencies
 ./bin/installdependencies.sh
-
-# register runner with GitHub
-sudo -u ubuntu ./config.sh --unattended --url ${REPOSITORY_URL} --token ${REPOSITORY_TOKEN}
-
-# start runner
-./svc.sh install
-./svc.sh start
--- a/.github/runners/runner-setup.sh
+++ b/.github/runners/runner-setup.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# Copyright 2021 The Flux authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script installs a GitHub self-hosted ARM64 runner for running Flux end-to-end tests.
+
+set -eu
+
+RUNNER_NAME=$1
+REPOSITORY_TOKEN=$2
+REPOSITORY_URL=${3:-https://github.com/fluxcd/flux2}
+
+GITHUB_RUNNER_VERSION=2.285.1
+
+# download runner
+curl -o actions-runner-linux-arm64.tar.gz -L https://github.com/actions/runner/releases/download/v${GITHUB_RUNNER_VERSION}/actions-runner-linux-arm64-${GITHUB_RUNNER_VERSION}.tar.gz \
+  && tar xzf actions-runner-linux-arm64.tar.gz \
+  && rm actions-runner-linux-arm64.tar.gz
+
+# register runner with GitHub
+./config.sh --unattended --url ${REPOSITORY_URL} --token ${REPOSITORY_TOKEN} --name ${RUNNER_NAME}
+
+# start runner
+sudo ./svc.sh install
+sudo ./svc.sh start
--- a/.github/workflows/e2e-arm64.yaml
+++ b/.github/workflows/e2e-arm64.yaml
@@ -3,14 +3,13 @@ name: e2e-arm64
 on:
  workflow_dispatch:
  push:
-    branches: [ main, update-components, arm64-e2e ]
+    branches: [ main, update-components, equinix-runners ]

 jobs:
-  ampere:
-    # Runner info
-    # Owner: Stefan Prodan
+  test:
+    # Hosted on Equinix
    # Docs: https://github.com/fluxcd/flux2/tree/main/.github/runners
-    runs-on: [self-hosted, Linux, ARM64]
+    runs-on: [self-hosted, Linux, ARM64, equinix]
    steps:
      - name: Checkout
        uses: actions/checkout@v2
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -2,7 +2,7 @@ name: e2e

 on:
  push:
-    branches: [ main ]
+    branches: [ main, e2e* ]
  pull_request:
    branches: [ main ]

@@ -35,7 +35,7 @@ jobs:
          version: "1.21.x"
      - name: Setup Calico for network policy
        run: |
-          kubectl apply -f https://docs.projectcalico.org/v3.16/manifests/calico.yaml
+          kubectl apply -f https://docs.projectcalico.org/v3.20/manifests/calico.yaml
          kubectl -n kube-system set env daemonset/calico-node FELIX_IGNORELOOSERPF=true
      - name: Setup Kustomize
        uses: fluxcd/pkg//actions/kustomize@main
--- a/4
+++ b/4
@@ -12,9 +12,9 @@ should.

 In alphabetical order:

-Aurel Canciu, Sortlist <aurel@sortlist.com> (github: @relu, slack: relu)
+Aurel Canciu, NexHealth <aurel.canciu@nexhealth.com> (github: @relu, slack: relu)
 Hidde Beydals, Weaveworks <hidde@weave.works> (github: @hiddeco, slack: hidde)
-Max Jonas Werner, D2iQ <mwerner@d2iq.com> (github: @makkes, slack: max)
+Max Jonas Werner, D2iQ <max@e13.dev> (github: @makkes, slack: max)
 Philip Laine, Xenit <philip.laine@xenit.se> (github: @phillebaba, slack: phillebaba)
 Stefan Prodan, Weaveworks <stefan@weave.works> (github: @stefanprodan, slack: stefanprodan)
 Sunny, Weaveworks <sunny@weave.works> (github: @darkowlzz, slack: darkowlzz)
--- a/cmd/flux/trace.go
+++ b/cmd/flux/trace.go
@@ -40,7 +40,7 @@ import (

 var traceCmd = &cobra.Command{
 	Use:   "trace [name]",
-	Short: "trace an in-cluster object throughout the GitOps delivery pipeline",
+	Short: "Trace an in-cluster object throughout the GitOps delivery pipeline",
 	Long: `The trace command shows how an object is managed by Flux,
 from which source and revision it comes, and what's the latest reconciliation status.'`,
 	Example: `  # Trace a Kubernetes Deployment
--- a/go.mod
+++ b/go.mod
@@ -7,10 +7,10 @@ require (
 	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7
 	github.com/cyphar/filepath-securejoin v0.2.2
 	github.com/fluxcd/go-git-providers v0.4.0
-	github.com/fluxcd/helm-controller/api v0.14.0
+	github.com/fluxcd/helm-controller/api v0.14.1
 	github.com/fluxcd/image-automation-controller/api v0.18.0
 	github.com/fluxcd/image-reflector-controller/api v0.14.0
-	github.com/fluxcd/kustomize-controller/api v0.18.1
+	github.com/fluxcd/kustomize-controller/api v0.18.2
 	github.com/fluxcd/notification-controller/api v0.19.0
 	github.com/fluxcd/pkg/apis/meta v0.10.1
 	github.com/fluxcd/pkg/runtime v0.12.2
@@ -18,7 +18,7 @@ require (
 	github.com/fluxcd/pkg/ssh v0.0.5
 	github.com/fluxcd/pkg/untar v0.0.5
 	github.com/fluxcd/pkg/version v0.0.1
-	github.com/fluxcd/source-controller/api v0.19.0
+	github.com/fluxcd/source-controller/api v0.19.2
 	github.com/go-errors/errors v1.4.0 // indirect
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/google/go-cmp v0.5.6
--- a/go.sum
+++ b/go.sum
@@ -225,20 +225,20 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fluxcd/go-git-providers v0.4.0 h1:hdGGRDCNphf9FRrk297lorhwHWcST74R7cGAOZTRtSU=
 github.com/fluxcd/go-git-providers v0.4.0/go.mod h1:enIPrXnSOBxahS6rngohpG3d/QZ3yjjy/w+agbp97ZI=
-github.com/fluxcd/helm-controller/api v0.14.0 h1:I6gyOaEcUUEk0cuXgKhvmvgN833LxdZ3dngTnMDii7w=
-github.com/fluxcd/helm-controller/api v0.14.0/go.mod h1:3wDrDVSH/3yH31PzfXzYCCf8OP70eg82tlQU1+QGsS0=
+github.com/fluxcd/helm-controller/api v0.14.1 h1:aAWaYZxTI68SD1R2SpNJh8+hm9oBeIOa9nW4YX5qYjM=
+github.com/fluxcd/helm-controller/api v0.14.1/go.mod h1:NkfZ5ugs9EUUPSGHfAnNs295mf8sVKG0842aL6cFzMM=
 github.com/fluxcd/image-automation-controller/api v0.18.0 h1:/FMwAJ31s4xk5XL7AKYWT0Z9f+GpLbd55e2I1m6jg/o=
 github.com/fluxcd/image-automation-controller/api v0.18.0/go.mod h1:XqrRtH4aFOY1llgf4wx8VcSmzLsdV/xWcrPbdZjvvLg=
 github.com/fluxcd/image-reflector-controller/api v0.14.0 h1:JlwwpQENkGSxtAC7VXykpOqObsupO61easXu30jpvb0=
 github.com/fluxcd/image-reflector-controller/api v0.14.0/go.mod h1:ew7uL5XzPH3QTfNxt3BAklDh9ONrR5I2m3D7ST0zE9E=
-github.com/fluxcd/kustomize-controller/api v0.18.1 h1:cssv85lh5RlDDEFvMv/4InR/7SzqX/+rVMYA3GqpnFI=
-github.com/fluxcd/kustomize-controller/api v0.18.1/go.mod h1:xGHBIzVXepzm2/0iQJJSbCIRY0Ahq5AgbYsVojpRyX0=
+github.com/fluxcd/kustomize-controller/api v0.18.2 h1:rGu9R6PMFw3x0S6tVj/ZS54sJWW6/cdWe0Gga09e1AY=
+github.com/fluxcd/kustomize-controller/api v0.18.2/go.mod h1:psXYbb3lbSCbakC715fzdpUnuILra00N++t/S1UUDRM=
 github.com/fluxcd/notification-controller/api v0.19.0 h1:mSsDj30T4v/9aL2GoMY616p+6nIifD1nrZiBD/rUi8U=
 github.com/fluxcd/notification-controller/api v0.19.0/go.mod h1:SkB3tLOXouLN6PAceNCsJrJaawHt+WiUVfUSIYcpwjs=
 github.com/fluxcd/pkg/apis/acl v0.0.1 h1:biCgZMjpDSv3Q4mZPikUJILx3t2MuNXR4Oa5jRQxaNQ=
 github.com/fluxcd/pkg/apis/acl v0.0.1/go.mod h1:y3qOXUFObVWk7jzOjubMnr/u18j1kCeSi6olycnxr/E=
-github.com/fluxcd/pkg/apis/kustomize v0.2.0 h1:jhu2QHvs+j3Zo9rR6w8hkO3LSC6h3M37zY5ejufOmxY=
-github.com/fluxcd/pkg/apis/kustomize v0.2.0/go.mod h1:gEl+W5cVykCC3RfrCaqe+Pz+j4lKl2aeR4dxsom/zII=
+github.com/fluxcd/pkg/apis/kustomize v0.3.0 h1:o7o8hHIWh+1kyx/E21b2tZpCD4tX8NRijbGioAZXSBU=
+github.com/fluxcd/pkg/apis/kustomize v0.3.0/go.mod h1:bkeOkDpm2PQamZT+RLs20ZOt3TgOdLKWmi9kVxmcdmM=
 github.com/fluxcd/pkg/apis/meta v0.10.0/go.mod h1:CW9X9ijMTpNe7BwnokiUOrLl/h13miwVr/3abEQLbKE=
 github.com/fluxcd/pkg/apis/meta v0.10.1 h1:zISenRlqNG7WK8TP3HxZTvv+1Z7JZOUIQvZrOr6pQ2w=
 github.com/fluxcd/pkg/apis/meta v0.10.1/go.mod h1:yUblM2vg+X8TE3A2VvJfdhkGmg+uqBlSPkLk7dxi0UM=
@@ -252,8 +252,9 @@ github.com/fluxcd/pkg/untar v0.0.5 h1:UGI3Ch1UIEIaqQvMicmImL1s9npQa64DJ/ozqHKB7g
 github.com/fluxcd/pkg/untar v0.0.5/go.mod h1:O6V9+rtl8c1mHBafgqFlJN6zkF1HS5SSYn7RpQJ/nfw=
 github.com/fluxcd/pkg/version v0.0.1 h1:/8asQoDXSThz3csiwi4Qo8Zb6blAxLXbtxNgeMJ9bCg=
 github.com/fluxcd/pkg/version v0.0.1/go.mod h1:WAF4FEEA9xyhngF8TDxg3UPu5fA1qhEYV8Pmi2Il01Q=
-github.com/fluxcd/source-controller/api v0.19.0 h1:D4hc/ROhcl7iJdgeVhmM6B7WkDqwtQKnvpl04n+LcNg=
 github.com/fluxcd/source-controller/api v0.19.0/go.mod h1:rUqw0LmoCyGUoElmtLqHc8O35WAQUd8LdgdyDA+kNs4=
+github.com/fluxcd/source-controller/api v0.19.2 h1:+C1s9KslnkA/3SIfvEkFDIesaEpzLKFkumCUYOx5lz8=
+github.com/fluxcd/source-controller/api v0.19.2/go.mod h1:rUqw0LmoCyGUoElmtLqHc8O35WAQUd8LdgdyDA+kNs4=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c=
--- a/manifests/bases/helm-controller/kustomization.yaml
+++ b/manifests/bases/helm-controller/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
- https://github.com/fluxcd/helm-controller/releases/download/v0.14.0/helm-controller.crds.yaml
- https://github.com/fluxcd/helm-controller/releases/download/v0.14.0/helm-controller.deployment.yaml
+- https://github.com/fluxcd/helm-controller/releases/download/v0.14.1/helm-controller.crds.yaml
+- https://github.com/fluxcd/helm-controller/releases/download/v0.14.1/helm-controller.deployment.yaml
 - account.yaml
 patchesJson6902:
 - target:
--- a/manifests/bases/kustomize-controller/kustomization.yaml
+++ b/manifests/bases/kustomize-controller/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
- https://github.com/fluxcd/kustomize-controller/releases/download/v0.18.1/kustomize-controller.crds.yaml
- https://github.com/fluxcd/kustomize-controller/releases/download/v0.18.1/kustomize-controller.deployment.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v0.18.2/kustomize-controller.crds.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v0.18.2/kustomize-controller.deployment.yaml
 - account.yaml
 patchesJson6902:
 - target:
--- a/manifests/bases/source-controller/kustomization.yaml
+++ b/manifests/bases/source-controller/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
- https://github.com/fluxcd/source-controller/releases/download/v0.19.0/source-controller.crds.yaml
- https://github.com/fluxcd/source-controller/releases/download/v0.19.0/source-controller.deployment.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v0.19.2/source-controller.crds.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v0.19.2/source-controller.deployment.yaml
 - account.yaml
 patchesJson6902:
 - target:
--- a/manifests/crds/kustomization.yaml
+++ b/manifests/crds/kustomization.yaml
@@ -1,9 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
- https://github.com/fluxcd/source-controller/releases/download/v0.19.0/source-controller.crds.yaml
- https://github.com/fluxcd/kustomize-controller/releases/download/v0.18.1/kustomize-controller.crds.yaml
- https://github.com/fluxcd/helm-controller/releases/download/v0.14.0/helm-controller.crds.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v0.19.2/source-controller.crds.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v0.18.2/kustomize-controller.crds.yaml
+- https://github.com/fluxcd/helm-controller/releases/download/v0.14.1/helm-controller.crds.yaml
 - https://github.com/fluxcd/notification-controller/releases/download/v0.19.0/notification-controller.crds.yaml
 - https://github.com/fluxcd/image-reflector-controller/releases/download/v0.14.0/image-reflector-controller.crds.yaml
 - https://github.com/fluxcd/image-automation-controller/releases/download/v0.18.0/image-automation-controller.crds.yaml
--- a/manifests/monitoring/grafana/dashboards/control-plane.json
+++ b/manifests/monitoring/grafana/dashboards/control-plane.json
@@ -8,22 +8,30 @@
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
        "type": "dashboard"
      }
    ]
  },
  "editable": true,
+  "fiscalYearStartMonth": 0,
  "gnetId": null,
  "graphTooltip": 0,
-  "iteration": 1596541513301,
+  "id": 29,
+  "iteration": 1639041352219,
  "links": [],
+  "liveNow": false,
  "panels": [
    {
      "datasource": "${DS_PROMETHEUS}",
      "description": "",
      "fieldConfig": {
        "defaults": {
-          "custom": {},
          "decimals": 0,
          "mappings": [],
          "thresholds": {
@@ -62,9 +70,10 @@
          "fields": "",
          "values": false
        },
+        "text": {},
        "textMode": "value"
      },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "targets": [
        {
          "expr": "sum(go_info{namespace=\"$namespace\",pod=~\".*-controller-.*\"})",
@@ -83,7 +92,6 @@
      "description": "",
      "fieldConfig": {
        "defaults": {
-          "custom": {},
          "mappings": [],
          "thresholds": {
            "mode": "absolute",
@@ -125,9 +133,10 @@
          "fields": "",
          "values": false
        },
+        "text": {},
        "textMode": "auto"
      },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "targets": [
        {
          "expr": "max(workqueue_longest_running_processor_seconds{namespace=\"$namespace\",pod=~\".*-controller-.*\"})",
@@ -147,7 +156,6 @@
      "description": "",
      "fieldConfig": {
        "defaults": {
-          "custom": {},
          "mappings": [],
          "thresholds": {
            "mode": "absolute",
@@ -187,9 +195,10 @@
          "values": false
        },
        "showThresholdLabels": false,
-        "showThresholdMarkers": true
+        "showThresholdMarkers": true,
+        "text": {}
      },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "targets": [
        {
          "expr": "sum(go_memstats_alloc_bytes{namespace=\"$namespace\",pod=~\".*-controller-.*\"})",
@@ -208,9 +217,6 @@
      "description": "",
      "fieldConfig": {
        "defaults": {
-          "custom": {
-            "align": null
-          },
          "mappings": [],
          "thresholds": {
            "mode": "absolute",
@@ -251,9 +257,10 @@
          "fields": "",
          "values": false
        },
+        "text": {},
        "textMode": "auto"
      },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "targets": [
        {
          "expr": "sum(rate(rest_client_requests_total{namespace=\"$namespace\",pod=~\".*-controller-.*\"}[1m]))",
@@ -267,131 +274,6 @@
      "title": "API Requests",
      "type": "stat"
    },
-    {
-      "collapsed": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 5
-      },
-      "id": 15,
-      "panels": [],
-      "title": "Resource Usage",
-      "type": "row"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 6
-      },
-      "hiddenSeries": false,
-      "id": 8,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": false,
-        "min": false,
-        "rightSide": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "percentage": false,
-      "pluginVersion": "7.1.1",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "histogram_quantile(0.50, sum(rate(rest_client_request_latency_seconds_bucket{namespace=\"$namespace\"}[5m])) by (le))",
-          "interval": "",
-          "legendFormat": "P50",
-          "refId": "A"
-        },
-        {
-          "expr": "histogram_quantile(0.90, sum(rate(rest_client_request_latency_seconds_bucket{namespace=\"$namespace\"}[5m])) by (le))",
-          "hide": true,
-          "interval": "",
-          "legendFormat": "P90",
-          "refId": "B"
-        },
-        {
-          "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_latency_seconds_bucket{namespace=\"$namespace\"}[5m])) by (le))",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "P99",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Kubernetes API Requests Duration",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:912",
-          "format": "s",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "$$hashKey": "object:913",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
    {
      "aliasColors": {},
      "bars": false,
@@ -400,19 +282,13 @@
      "datasource": "${DS_PROMETHEUS}",
      "decimals": null,
      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
      "fill": 1,
      "fillGradient": 0,
      "gridPos": {
        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 6
+        "w": 24,
+        "x": 0,
+        "y": 5
      },
      "hiddenSeries": false,
      "id": 21,
@@ -430,8 +306,11 @@
      "lines": true,
      "linewidth": 1,
      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
      "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -499,18 +378,30 @@
        "alignLevel": null
      }
    },
+    {
+      "collapsed": false,
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {},
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 13
+      },
+      "id": 15,
+      "panels": [],
+      "title": "Resource Usage",
+      "type": "row"
+    },
    {
      "aliasColors": {},
      "bars": false,
      "dashLength": 10,
      "dashes": false,
      "datasource": "${DS_PROMETHEUS}",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
      "fill": 1,
      "fillGradient": 0,
      "gridPos": {
@@ -534,8 +425,11 @@
      "lines": true,
      "linewidth": 1,
      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
      "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -600,12 +494,6 @@
      "dashLength": 10,
      "dashes": false,
      "datasource": "${DS_PROMETHEUS}",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
      "fill": 1,
      "fillGradient": 0,
      "gridPos": {
@@ -629,8 +517,11 @@
      "lines": true,
      "linewidth": 1,
      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
      "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -694,6 +585,10 @@
    {
      "collapsed": false,
      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {},
+        "overrides": []
+      },
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -711,12 +606,6 @@
      "dashLength": 10,
      "dashes": false,
      "datasource": "${DS_PROMETHEUS}",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
      "fill": 1,
      "fillGradient": 0,
      "gridPos": {
@@ -741,8 +630,11 @@
      "lines": true,
      "linewidth": 1,
      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
      "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -810,12 +702,6 @@
      "datasource": "${DS_PROMETHEUS}",
      "decimals": 2,
      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
      "fill": 1,
      "fillGradient": 0,
      "gridPos": {
@@ -841,7 +727,7 @@
      "linewidth": 1,
      "nullPointMode": "null",
      "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -916,12 +802,6 @@
      "datasource": "${DS_PROMETHEUS}",
      "decimals": 2,
      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
      "fill": 1,
      "fillGradient": 0,
      "gridPos": {
@@ -947,7 +827,7 @@
      "linewidth": 1,
      "nullPointMode": "null",
      "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -1017,6 +897,10 @@
    {
      "collapsed": false,
      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {},
+        "overrides": []
+      },
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -1034,12 +918,6 @@
      "dashLength": 10,
      "dashes": false,
      "datasource": "${DS_PROMETHEUS}",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
      "fill": 1,
      "fillGradient": 0,
      "gridPos": {
@@ -1065,7 +943,7 @@
      "linewidth": 1,
      "nullPointMode": "null as zero",
      "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -1147,12 +1025,6 @@
      "datasource": "${DS_PROMETHEUS}",
      "decimals": 2,
      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
      "fill": 1,
      "fillGradient": 0,
      "gridPos": {
@@ -1178,7 +1050,7 @@
      "linewidth": 1,
      "nullPointMode": "null",
      "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -1253,12 +1125,6 @@
      "datasource": "${DS_PROMETHEUS}",
      "decimals": 2,
      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
      "fill": 1,
      "fillGradient": 0,
      "gridPos": {
@@ -1284,7 +1150,7 @@
      "linewidth": 1,
      "nullPointMode": "null",
      "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "8.2.3",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -1353,7 +1219,7 @@
    }
  ],
  "refresh": "10s",
-  "schemaVersion": 26,
+  "schemaVersion": 31,
  "style": "light",
  "tags": [
    "flux"
@@ -1366,6 +1232,8 @@
          "text": "Prometheus",
          "value": "Prometheus"
        },
+        "description": null,
+        "error": null,
        "hide": 2,
        "includeAll": false,
        "label": null,
@@ -1387,19 +1255,23 @@
        },
        "datasource": "${DS_PROMETHEUS}",
        "definition": "workqueue_work_duration_seconds_count",
+        "description": null,
+        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": null,
        "multi": false,
        "name": "namespace",
        "options": [],
-        "query": "workqueue_work_duration_seconds_count",
+        "query": {
+          "query": "workqueue_work_duration_seconds_count",
+          "refId": "Prometheus-namespace-Variable-Query"
+        },
        "refresh": 2,
        "regex": "/.*namespace=\"([^\"]*).*/",
        "skipUrlSync": false,
        "sort": 0,
        "tagValuesQuery": "",
-        "tags": [],
        "tagsQuery": "",
        "type": "query",
        "useTags": false
@@ -1426,5 +1298,5 @@
  "timezone": "",
  "title": "Flux Control Plane",
  "uid": "flux-control-plane",
-  "version": 1
-}
+  "version": 2
+}
--- a/manifests/monitoring/kube-prometheus-stack/release.yaml
+++ b/manifests/monitoring/kube-prometheus-stack/release.yaml
@@ -6,6 +6,7 @@ spec:
  interval: 5m
  chart:
    spec:
+      version: 19.3.0
      chart: kube-prometheus-stack
      sourceRef:
        kind: HelmRepository
--- a/rfcs/README.md
+++ b/rfcs/README.md
@@ -0,0 +1,45 @@
+# Flux RFCs
+
+In many cases, new features and enhancements are proposed on [flux2/discussions](https://github.com/fluxcd/flux2/discussions).
+A proposal is discussed in public by maintainers, contributors, users and other interested parties.
+After some form of consensus is reached between participants, the proposed changes go through the
+pull request process where the implementation details are reviewed, approved or rejected by maintainers.
+
+Some proposals may be **substantial**, and for these we ask for a design process to be followed
+so that all stakeholders can be confident about the direction Flux is evolving in.
+
+The "RFC" (request for comments) process is intended to provide a consistent and
+controlled path for substantial changes to enter Flux.
+
+Examples of substantial changes:
+
+- API additions (new kinds of resources, new relationships between existing APIs)
+- API breaking changes (new required fields, field removals)
+- Security related changes (Flux controllers permissions, tenant isolation and impersonation)
+- Impactful UX changes (new required inputs to the bootstrap process)
+- Drop capabilities (sunset an existing integration with an external service due to security concerns)
+
+## RFC Process
+
+- Before submitting an RFC please discuss the proposal with the Flux community.
+  Start a discussion on GitHub and ask for feedback at the weekly dev meeting.
+  You must find a maintainer willing to sponsor the RFC.
+- Submit an RFC by opening a pull request using [RFC-0000](RFC-0000/README.md) as template.
+- The sponsor will assign the PR to themselves, will label the PR with `area/RFC` and
+  will request other maintainers to begin the review process.
+- Integrate feedback by adding commits without overriding the history.
+- At least two maintainers have to approve the proposal before it can be merged.
+  Approvers must be satisfied that an
+  [appropriate level of consensus](https://github.com/fluxcd/community/blob/main/GOVERNANCE.md#decision-guidelines)
+  has been reached.
+- Before the merge, an RFC number is assigned by the sponsor and the PR branch must be rebased with main.
+- Once merged, the proposal may be implemented in Flux.
+  The progress could be tracked using the RFC number (used as prefix for issues and PRs).
+- After the proposal implementation is available in a release candidate or final release,
+  the RFC should be updated with the Flux version added to the "Implementation History" section.
+- During the implementation phase, the RFC could be discarded due to security or performance concerns.
+  In this case, the RFC "Implementation History" should state the rejection motives.
+  Ultimately the decision on the feasibility of a particular implementation,
+  resides with the maintainers that reviewed the code changes.
+- A new RFC could be summited with the scope of replacing an RFC rejected during implementation.
+  The new RFC must come with a solution for the rejection motives of the previous RFC.
--- a/rfcs/RFC-0000/README.md
+++ b/rfcs/RFC-0000/README.md
@@ -0,0 +1,92 @@
+# RFC-NNNN Title
+
+<!--
+The title must be short and descriptive.
+-->
+
+**Status:** provisional
+
+<!--
+Status represents the current state of the RFC.
+Must be one of `provisional`, `implementable`, `implemented`, `deferred`, `rejected`, `withdrawn`, or `replaced`.
+-->
+
+**Creation date:** YYYY-MM-DD
+
+**Last update:** YYYY-MM-DD
+
+## Summary
+
+<!--
+One paragraph explanation of the proposed feature or enhancement.
+-->
+
+## Motivation
+
+<!--
+This section is for explicitly listing the motivation, goals, and non-goals of
+this RFC. Describe why the change is important and the benefits to users.
+-->
+
+### Goals
+
+<!--
+List the specific goals of this RFC. What is it trying to achieve? How will we
+know that this has succeeded?
+-->
+
+### Non-Goals
+
+<!--
+What is out of scope for this RFC? Listing non-goals helps to focus discussion
+and make progress.
+-->
+
+## Proposal
+
+<!--
+This is where we get down to the specifics of what the proposal actually is.
+This should have enough detail that reviewers can understand exactly what
+you're proposing, but should not include things like API designs or
+implementation.
+
+If the RFC goal is to document best practices,
+then this section can be replaced with the the actual documentation.
+-->
+
+### User Stories
+
+<!--
+Optional if existing discussions and/or issues are linked in the motivation section.
+-->
+
+### Alternatives
+
+<!--
+List plausible alternatives to the proposal and explain why the proposal is superior.
+
+This is a good place to incorporate suggestions made during discussion of the RFC.
+-->
+
+## Design Details
+
+<!--
+This section should contain enough information that the specifics of your
+change are understandable. This may include API specs and code snippets.
+
+The design details should address at least the following questions:
+- How can this feature be enabled / disabled?
+- Does enabling the feature change any default behavior?
+- Can the feature be disabled once it has been enabled?
+- How can an operator determine if the feature is in use?
+- Are there any drawbacks when enabling this feature?
+-->
+
+## Implementation History
+
+<!--
+Major milestones in the lifecycle of the RFC such as:
+- The first Flux release where an initial version of the RFC was available.
+- The version of Flux where the RFC graduated to general availability.
+- The version of Flux where the RFC was retired or superseded.
+-->
Author	SHA1	Message	Date
Stefan Prodan	ff7df54899	Merge pull request #2178 from fluxcd/update-components Update toolkit components	2021-12-09 21:00:42 +02:00
fluxcdbot	b75ce95086	Update toolkit components - helm-controller to v0.14.1 https://github.com/fluxcd/helm-controller/blob/v0.14.1/CHANGELOG.md - kustomize-controller to v0.18.2 https://github.com/fluxcd/kustomize-controller/blob/v0.18.2/CHANGELOG.md - source-controller to v0.19.2 https://github.com/fluxcd/source-controller/blob/v0.19.2/CHANGELOG.md Signed-off-by: GitHub <noreply@github.com>	2021-12-09 17:24:34 +00:00
Hidde Beydals	a86d94745a	Merge pull request #2159 from fluxcd/trace-short-styling	2021-12-09 18:23:53 +01:00
Hidde Beydals	c13de6089a	cmd: start trace short description with T This fixes a styling issue: ``` $ flux --help Command line utility for assembling Kubernetes CD pipelines the GitOps way. Usage: flux [command] ... Available Commands: ... suspend Suspend resources trace trace an in-cluster object throughout the GitOps delivery pipeline uninstall Uninstall Flux and its custom resource definitions ... ``` Signed-off-by: Hidde Beydals <hello@hidde.co>	2021-12-09 17:35:53 +01:00
Stefan Prodan	3cb748a47e	Merge pull request #2153 from fluxcd/e2e-calico-v3.20 e2e: Update Calico to v3.20	2021-12-09 17:59:19 +02:00
Stefan Prodan	3e6e93fab4	e2e: Update Calico to v3.20 Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-12-09 17:26:37 +02:00
Stefan Prodan	5832811930	Merge pull request #2195 from Nalum/issue-2192 Removing Kubernetes API Request Duration Graph	2021-12-09 16:22:44 +02:00
Luke Mallon (Nalum)	6f0ea04ff3	[refactor] Update JSON from Grafana export Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>	2021-12-09 09:46:35 +00:00
Stefan Prodan	26ea167524	Merge pull request #2194 from kingdonb/fixup-monitoring-guide monitoring: Pin kube-prometheus-stack to v19.3.0	2021-12-09 10:04:31 +02:00
Kingdon Barrett	1393e7a62b	pin monitoring release version at 19.3.0 Something in kube-prometheus-stack 20.0.0 has broken our example. See https://github.com/fluxcd/flux2/pull/2193 for more information. Signed-off-by: Kingdon Barrett <kingdon@weave.works>	2021-12-08 16:06:27 -05:00
Stefan Prodan	7e1fd499ca	Merge pull request #2191 from fluxcd/equinix-runners Run the ARM64 e2e tests on Equinix hardware	2021-12-08 18:35:42 +02:00
Stefan Prodan	309fd86b45	Run ARM64 e2e tests on Equinix hardware Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-12-08 18:07:43 +02:00
Max Jonas Werner	e14357f694	Merge pull request #2162 from dholbach/update-max update Max email	2021-12-01 14:01:17 +01:00
Daniel Holbach	29f0adc587	update Max email Signed-off-by: Daniel Holbach <daniel@weave.works>	2021-12-01 12:14:42 +01:00
Stefan Prodan	3ab578747d	Merge pull request #2085 from fluxcd/rfc-template [RFC-0000] Introduce the Flux RFC template	2021-11-30 18:52:58 +02:00
Stefan Prodan	2c3cb1a664	Add template to RFC-0000 Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-11-30 17:26:57 +02:00
Stefan Prodan	99a0c47277	Add RFC process Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-11-30 16:25:40 +02:00
Stefan Prodan	c5b2c6709a	Add status, creation and last update date fields to RFC template Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-11-30 15:03:45 +02:00
Stefan Prodan	8354ac937c	Introduce the Flux RFC template The RFC template is heavily inspired by Rust RFCs and Kubernetes KEPs. Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-11-30 15:03:45 +02:00
Daniel Holbach	aa5ad65286	Merge pull request #2147 from dholbach/change-relu-email update Aurel's email	2021-11-26 14:54:54 +01:00
Daniel Holbach	05adb44416	update Aurel's email Signed-off-by: Daniel Holbach <daniel@weave.works>	2021-11-26 14:29:54 +01:00