[release-0.11] Adds dependency on github.com/grafana/jsonnet-libs mixins-util (#2479 )

* chore: ignore mdox errors for https://www.weave.works * Add lockfile
[bot] [release-0.11] Automated version update (#2314 )
2024-08-07 17:12:28 +01:00 · 2024-01-03 17:32:13 +00:00 · 2023-11-27 12:08:37 +00:00 · 2023-07-27 04:10:25 -07:00 · 2022-07-04 14:56:40 +02:00 · 2022-06-29 18:25:27 +02:00
9 changed files with 463 additions and 668 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,8 +3,8 @@ on:
  - push
  - pull_request
 env:
-  golang-version: '1.17'
-  kind-version: 'v0.14.0'
+  golang-version: '1.19'
+  kind-version: 'v0.19.0'
 jobs:
  generate:
    runs-on: ${{ matrix.os }}
@@ -18,7 +18,7 @@ jobs:
    - uses: actions/checkout@v3
      with:
        persist-credentials: false
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4
      with:
        go-version: ${{ env.golang-version }}
    - run: make --always-make generate validate && git diff --exit-code
@@ -29,7 +29,7 @@ jobs:
    - uses: actions/checkout@v3
      with:
        persist-credentials: false
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4
      with:
        go-version: ${{ env.golang-version }}
    - run: make check-docs
@@ -40,7 +40,7 @@ jobs:
    - uses: actions/checkout@v3
      with:
        persist-credentials: false
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4
      with:
        go-version: ${{ env.golang-version }}
    - run: make --always-make lint
@@ -51,7 +51,7 @@ jobs:
    - uses: actions/checkout@v3
      with:
        persist-credentials: false
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4
      with:
        go-version: ${{ env.golang-version }}
    - run: make --always-make fmt && git diff --exit-code
@@ -62,7 +62,7 @@ jobs:
    - uses: actions/checkout@v3
      with:
        persist-credentials: false
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4
      with:
        go-version: ${{ env.golang-version }}
    - run: make --always-make test
@@ -73,7 +73,7 @@ jobs:
    - uses: actions/checkout@v3
      with:
        persist-credentials: false
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4
      with:
        go-version: ${{ env.golang-version }}
    - run: make --always-make kubescape
@@ -89,7 +89,7 @@ jobs:
    - uses: actions/checkout@v3
      with:
        persist-credentials: false
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v4
      with:
        go-version: ${{ env.golang-version }}
    - name: Start KinD
@@ -99,23 +99,9 @@ jobs:
        image: ${{ matrix.kind-image }}
        wait: 10s # Without default CNI, control-plane doesn't get ready until Cilium is installed
        config: .github/workflows/kind/config.yml
-    - name: Setup Helm
-      uses: azure/setup-helm@v2.1
-    - name: Install Cilium
+    - name: Install kube-router for NetworkPolicy support
      run: |
-        helm repo add cilium https://helm.cilium.io/
-        helm install cilium cilium/cilium --version 1.9.13 \
-        --namespace kube-system \
-        --set nodeinit.enabled=true \
-        --set kubeProxyReplacement=partial \
-        --set hostServices.enabled=false \
-        --set externalIPs.enabled=true \
-        --set nodePort.enabled=true \
-        --set hostPort.enabled=true \
-        --set bpf.masquerade=false \
-        --set image.pullPolicy=IfNotPresent \
-        --set ipam.mode=kubernetes \
-        --set operator.replicas=1
+        kubectl apply -f .github/workflows/kind/kube-router.yaml
    - name: Wait for cluster to finish bootstraping
      run: kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout=300s
    - name: Create kube-prometheus stack
--- a/.github/workflows/kind/config.yml
+++ b/.github/workflows/kind/config.yml
@@ -1,6 +1,15 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 networking:
-  disableDefaultCNI: true
  podSubnet: "10.10.0.0/16"
  serviceSubnet: "10.11.0.0/16"
+nodes:
+  - role: control-plane
+    extraMounts:
+      - hostPath: /home/runner/work/kube-prometheus/kube-prometheus/.github/workflows/kind/patches
+        containerPath: /patches
+kubeadmConfigPatches:
+  - |
+    kind: InitConfiguration
+    patches:
+      directory: /patches
--- a/.github/workflows/kind/kube-router.yaml
+++ b/.github/workflows/kind/kube-router.yaml
@@ -0,0 +1,186 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kube-router-cfg
+  namespace: kube-system
+  labels:
+    tier: node
+    k8s-app: kube-router
+data:
+  cni-conf.json: |
+    {
+      "cniVersion":"0.3.0",
+      "name":"mynet",
+      "plugins":[
+        {
+          "name":"kubernetes",
+          "type":"bridge",
+          "bridge":"kube-bridge",
+          "isDefaultGateway":true,
+          "ipam":{
+            "type":"host-local"
+          }
+        }
+      ]
+    }
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  labels:
+    k8s-app: kube-router
+    tier: node
+  name: kube-router
+  namespace: kube-system
+spec:
+  selector:
+    matchLabels:
+      k8s-app: kube-router
+      tier: node
+  template:
+    metadata:
+      labels:
+        k8s-app: kube-router
+        tier: node
+    spec:
+      priorityClassName: system-node-critical
+      serviceAccountName: kube-router
+      containers:
+        - name: kube-router
+          image: docker.io/cloudnativelabs/kube-router
+          imagePullPolicy: Always
+          args:
+            - --run-router=true
+            - --run-firewall=true
+            - --run-service-proxy=false
+            - --bgp-graceful-restart=true
+          env:
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            - name: KUBE_ROUTER_CNI_CONF_FILE
+              value: /etc/cni/net.d/10-kuberouter.conflist
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 20244
+            initialDelaySeconds: 10
+            periodSeconds: 3
+          resources:
+            requests:
+              memory: 250Mi
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - name: lib-modules
+              mountPath: /lib/modules
+              readOnly: true
+            - name: cni-conf-dir
+              mountPath: /etc/cni/net.d
+            - name: kubeconfig
+              mountPath: /var/lib/kube-router/kubeconfig
+              readOnly: true
+            - name: xtables-lock
+              mountPath: /run/xtables.lock
+              readOnly: false
+      initContainers:
+        - name: install-cni
+          image: docker.io/cloudnativelabs/kube-router
+          imagePullPolicy: Always
+          command:
+            - /bin/sh
+            - -c
+            - set -e -x;
+              if [ ! -f /etc/cni/net.d/10-kuberouter.conflist ]; then
+              if [ -f /etc/cni/net.d/*.conf ]; then
+              rm -f /etc/cni/net.d/*.conf;
+              fi;
+              TMP=/etc/cni/net.d/.tmp-kuberouter-cfg;
+              cp /etc/kube-router/cni-conf.json ${TMP};
+              mv ${TMP} /etc/cni/net.d/10-kuberouter.conflist;
+              fi
+          volumeMounts:
+            - mountPath: /etc/cni/net.d
+              name: cni-conf-dir
+            - mountPath: /etc/kube-router
+              name: kube-router-cfg
+      hostNetwork: true
+      tolerations:
+        - effect: NoSchedule
+          operator: Exists
+        - key: CriticalAddonsOnly
+          operator: Exists
+        - effect: NoExecute
+          operator: Exists
+      volumes:
+        - name: lib-modules
+          hostPath:
+            path: /lib/modules
+        - name: cni-conf-dir
+          hostPath:
+            path: /etc/cni/net.d
+        - name: kube-router-cfg
+          configMap:
+            name: kube-router-cfg
+        - name: kubeconfig
+          hostPath:
+            path: /var/lib/kube-router/kubeconfig
+        - name: xtables-lock
+          hostPath:
+            path: /run/xtables.lock
+            type: FileOrCreate
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: kube-router
+  namespace: kube-system
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: kube-router
+  namespace: kube-system
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - namespaces
+      - pods
+      - services
+      - nodes
+      - endpoints
+    verbs:
+      - list
+      - get
+      - watch
+  - apiGroups:
+      - "networking.k8s.io"
+    resources:
+      - networkpolicies
+    verbs:
+      - list
+      - get
+      - watch
+  - apiGroups:
+      - extensions
+    resources:
+      - networkpolicies
+    verbs:
+      - get
+      - list
+      - watch
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: kube-router
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kube-router
+subjects:
+  - kind: ServiceAccount
+    name: kube-router
+    namespace: kube-system
--- a/.github/workflows/kind/patches/kube-controller-manager.yaml
+++ b/.github/workflows/kind/patches/kube-controller-manager.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: kube-controller-manager
+  namespace: kube-system
+spec:
+  containers:
+    - name: kube-controller-manager
+      resources:
+        requests:
+          cpu: 1m
--- a/.mdox.validate.yaml
+++ b/.mdox.validate.yaml
@@ -6,4 +6,8 @@ validators:
    type: "ignore"
  # Ignore release links.
  - regex: 'https:\/\/github\.com\/prometheus-operator\/kube-prometheus\/releases'
-    type: "ignore"
+    type: "ignore"
+  # the www.weave.works domain returns 404 for many pages.
+  # Ignoring for now but we need remove the related content if it persists.
+  - regex: 'https:\/\/www.weave.works.*'
+    type: "ignore"
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -9,5 +9,5 @@
  "prometheusOperator": "0.57.0",
  "kubeRbacProxy": "0.12.0",
  "configmapReload": "0.5.0",
-  "pyrra": "0.4.1"
+  "pyrra": "0.4.2"
 }
--- a/jsonnetfile.json
+++ b/jsonnetfile.json
@@ -1,6 +1,15 @@
 {
  "version": 1,
  "dependencies": [
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "mixin-utils"
+        }
+      },
+      "version": "master"
+    },
    {
      "source": {
        "local": {
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
          "subdir": "contrib/mixin"
        }
      },
-      "version": "0be65da6cc9905d93554bfdf51e1faaeae1149a4",
+      "version": "ae3b43a924c688f06560ada76a047d14b3935829",
      "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
    },
    {
@@ -38,8 +38,8 @@
          "subdir": "grafonnet"
        }
      },
-      "version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
-      "sum": "gF8foHByYcB25jcUOBqP6jxk0OPifQMjPvKY0HaCk6w="
+      "version": "a1d61cce1da59c71409b99b5c7568511fec661ea",
+      "sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc="
    },
    {
      "source": {
@@ -48,8 +48,18 @@
          "subdir": "grafana-builder"
        }
      },
-      "version": "9e9d5cddd4f02a25b9dec09a5910878a8ba8e045",
-      "sum": "TieGrr7GyKjURk1+wXHFpdoCiwNaIVfZvyc5mbI9OM0="
+      "version": "02db06f540086fa3f67d487bd01e1b314853fb8f",
+      "sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "mixin-utils"
+        }
+      },
+      "version": "d9ba581fb27aa6689e911f288d4df06948eb8aad",
+      "sum": "LoYq5QxJmUXEtqkEG8CFUBLBhhzDDaNANHc7Gz36ZdM="
    },
    {
      "source": {
@@ -68,7 +78,7 @@
          "subdir": "lib/promgrafonnet"
        }
      },
-      "version": "b8f44bb7be728423836bef0e904ec7166895a34b",
+      "version": "c72ac0392998343d53bd73343467f8bf2aa4e333",
      "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
    },
    {
@@ -140,7 +150,7 @@
          "subdir": "documentation/prometheus-mixin"
        }
      },
-      "version": "3c0a100dec2950f23e91f7efbf8867750960807d",
+      "version": "d7e7b8e04b5ecdc1dd153534ba376a622b72741b",
      "sum": "APXOIP3B3dZ3Tyh7L2UhyWR8Vbf5+9adTLz/ya7n6uU=",
      "name": "prometheus"
    },
@@ -151,7 +161,7 @@
          "subdir": "config/crd/bases"
        }
      },
-      "version": "1f6478a3e69cf77bef556672d8c037c96ec10306",
+      "version": "3738a607a42a0c9566587a49cec7587cc92d61bd",
      "sum": "GQ0GFKGdIWKx1b78VRs6jtC4SMqkBjT5jl65QUjPKK4="
    },
    {
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
Author	SHA1	Message	Date
Philip Gough	1a6fade961	[release-0.11] Adds dependency on github.com/grafana/jsonnet-libs mixins-util (#2479 ) * chore: ignore mdox errors for https://www.weave.works * Add lockfile	2024-08-07 17:12:28 +01:00
PromOperatorBot	71674a0f74	[bot] [release-0.11] Automated version update (#2314 ) Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>	2024-01-03 17:32:13 +00:00
PromOperatorBot	b44c4051e3	[bot] [release-0.11] Automated version update (#2292 ) Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>	2023-11-27 12:08:37 +00:00
PromOperatorBot	725b8bd3ac	[bot] [release-0.11] Automated version update (#2153 ) * [bot] [release-0.11] Automated version update * ci: Fixes bootstrapping KinD (#2174) --------- Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com> Co-authored-by: Philip Gough <philip.p.gough@gmail.com>	2023-07-27 04:10:25 -07:00
Matthias Loibl	e3066575dc	Merge pull request #1800 from MaxenceAdnot/patch-1 Update Pyrra to 0.4.2	2022-07-04 14:56:40 +02:00
Maxence Adnot	2e5c2040f0	Update Pyrra to 0.4.2 Pyrra 0.4.1 is crashing at start time and the fixed version is 0.4.2 so we should change the verison used See the issue in Pyrra repository: https://github.com/pyrra-dev/pyrra/issues/324	2022-06-29 18:25:27 +02:00