diff --git a/hack/scripts/portefaix-labels.sh b/hack/scripts/portefaix-labels.sh new file mode 100755 index 0000000000..df0557bedd --- /dev/null +++ b/hack/scripts/portefaix-labels.sh @@ -0,0 +1,38 @@ +# Copyright (C) 2021 Nicolas Lamirault +# +# 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. + +NO_COLOR="\033[0m" +DEBUG_COLOR="\e[34m" +INFO_COLOR="\e[32m" +ERROR_COLOR="\e[31m" +WARN_COLOR="\e[35m" + +label="portefaix.xyz/version" + +function usage() { + echo "Usage: $0 " +} + +manifests=$1 +[ -z "${manifests}" ] && echo "Environment not satisfied" && exit 1 +version=$2 +[ -z "${version}" ] && echo "Version not satisfied" && exit 1 + +IFS=" +" +for file in $(grep -R ${label} ${manifests}/*); do + filename=$(echo ${file} | awk -F":" '{ print $1 }') + echo -e "${INFO_COLOR}Update file: ${filename}${NO_COLOR}" + sed -i "s#${label}:.*#${label}: ${version}#g" ${filename} +done diff --git a/kubernetes/base/chaos-mesh/chaos-mesh/chaos-mesh.yaml b/kubernetes/base/chaos-mesh/chaos-mesh/chaos-mesh.yaml index e8431da914..1e1347f904 100644 --- a/kubernetes/base/chaos-mesh/chaos-mesh/chaos-mesh.yaml +++ b/kubernetes/base/chaos-mesh/chaos-mesh/chaos-mesh.yaml @@ -46,6 +46,9 @@ spec: cleanupOnFail: true timeout: 10m values: + customLabels: + portefaix.xyz: v0.13.0 + controllerManager: # image: pingcap/chaos-mesh:v1.0.2 resources: diff --git a/kubernetes/base/dns/external-dns/external-dns.yaml b/kubernetes/base/dns/external-dns/external-dns.yaml index db47fa37e4..207e37fcfa 100644 --- a/kubernetes/base/dns/external-dns/external-dns.yaml +++ b/kubernetes/base/dns/external-dns/external-dns.yaml @@ -33,7 +33,7 @@ spec: targetNamespace: dns values: podLabels: - portefaix.xyz/version: v0.11.0 + portefaix.xyz/version: v0.13.0 metrics: enabled: true serviceMonitor: diff --git a/kubernetes/base/flux-system/charts/vouch-proxy-charts.yaml b/kubernetes/base/flux-system/charts/vouch-proxy-charts.yaml index 9eb8b45737..c614b9e1ad 100644 --- a/kubernetes/base/flux-system/charts/vouch-proxy-charts.yaml +++ b/kubernetes/base/flux-system/charts/vouch-proxy-charts.yaml @@ -16,9 +16,9 @@ apiVersion: source.toolkit.fluxcd.io/v1beta1 kind: HelmRepository metadata: - name: oauth2-proxy-charts + name: halkeye-charts namespace: flux-system spec: interval: 24h - url: https://oauth2-proxy.github.io/manifests + url: https://halkeye.github.io/helm-charts timeout: 3m diff --git a/kubernetes/base/identity/oauth2-proxy/oauth2-proxy.yaml b/kubernetes/base/identity/oauth2-proxy/oauth2-proxy.yaml index e47cc2220b..c499b83bde 100644 --- a/kubernetes/base/identity/oauth2-proxy/oauth2-proxy.yaml +++ b/kubernetes/base/identity/oauth2-proxy/oauth2-proxy.yaml @@ -33,6 +33,9 @@ spec: releaseName: oauth2-proxy targetNamespace: identity values: + # TODO: https://github.com/oauth2-proxy/manifests/pull/25 + # customLabels: + # portefaix.xyz/version: v0.13.0 image: repository: "quay.io/oauth2-proxy/oauth2-proxy" tag: v7.1.3 diff --git a/kubernetes/base/identity/vouch-proxy/vouch-proxy.yaml b/kubernetes/base/identity/vouch-proxy/vouch-proxy.yaml index 50b944930b..d99aee6936 100644 --- a/kubernetes/base/identity/vouch-proxy/vouch-proxy.yaml +++ b/kubernetes/base/identity/vouch-proxy/vouch-proxy.yaml @@ -23,11 +23,11 @@ spec: chart: spec: # renovate: registryUrl=https://halkeye.github.io/helm-charts/ - chart: vouch-proxy + chart: vouch version: 2.0.0 sourceRef: kind: HelmRepository - name: vouch-proxy-charts + name: halkeye-charts namespace: flux-system interval: 5m releaseName: vouch-proxy diff --git a/kubernetes/base/ingress-controllers/ingress-nginx/ingress-nginx.yaml b/kubernetes/base/ingress-controllers/ingress-nginx/ingress-nginx.yaml index 321b534416..c69daaaa80 100644 --- a/kubernetes/base/ingress-controllers/ingress-nginx/ingress-nginx.yaml +++ b/kubernetes/base/ingress-controllers/ingress-nginx/ingress-nginx.yaml @@ -32,6 +32,9 @@ spec: releaseName: ingress-nginx targetNamespace: ingress-controllers values: + # TODO: https://github.com/kubernetes/ingress-nginx/pull/7186 + # commonLabels: + # portefaix.xyz/version: v0.13.0 controller: # image: # repository: k8s.gcr.io/ingress-nginx/controller diff --git a/kubernetes/base/litmus/kubernetes-chaos/kubernetes-chaos.yaml b/kubernetes/base/litmus/kubernetes-chaos/kubernetes-chaos.yaml index d27f2584d9..3010cf91f2 100644 --- a/kubernetes/base/litmus/kubernetes-chaos/kubernetes-chaos.yaml +++ b/kubernetes/base/litmus/kubernetes-chaos/kubernetes-chaos.yaml @@ -45,5 +45,5 @@ spec: timeout: 1m cleanupOnFail: true values: - # customLabels: - # portefaix.xyz/version: v0.11.0 + customLabels: + portefaix.xyz/version: v0.13.0 diff --git a/kubernetes/base/litmus/litmus-chaos/litmus-chaos.yaml b/kubernetes/base/litmus/litmus-chaos/litmus-chaos.yaml index 02f805304a..9a70ad41e8 100644 --- a/kubernetes/base/litmus/litmus-chaos/litmus-chaos.yaml +++ b/kubernetes/base/litmus/litmus-chaos/litmus-chaos.yaml @@ -45,6 +45,8 @@ spec: timeout: 1m cleanupOnFail: true values: + customLabels: + portefaix.xyz/version: v0.13.0 # operator: # image: # repository: litmuschaos/chaos-operator diff --git a/kubernetes/base/logging/loki/loki.yaml b/kubernetes/base/logging/loki/loki.yaml index 23eb5c4b42..673909c264 100644 --- a/kubernetes/base/logging/loki/loki.yaml +++ b/kubernetes/base/logging/loki/loki.yaml @@ -32,6 +32,10 @@ spec: releaseName: loki targetNamespace: logging values: + # TODO: https://github.com/grafana/helm-charts/pull/463 + # customLabels: + # portefaix.xyz/version: v0.13.0 + # image: # repository: grafana/loki # tag: 2.0.0 diff --git a/kubernetes/base/logging/vector/vector.yaml b/kubernetes/base/logging/vector/vector.yaml index 37633d0fdb..8eb8860989 100644 --- a/kubernetes/base/logging/vector/vector.yaml +++ b/kubernetes/base/logging/vector/vector.yaml @@ -32,8 +32,9 @@ spec: releaseName: vector-agent targetNamespace: logging values: - podAnnotations: - portefaix.xyz/version: v0.11.0 + # TODO: https://github.com/timberio/vector/pull/7687 + # customLabels: + # portefaix.xyz/version: v0.13.0 serviceAccount: create: true diff --git a/kubernetes/base/monitoring/kube-prometheus-stack/grafana-mixin.yaml b/kubernetes/base/monitoring/kube-prometheus-stack/grafana-mixin.yaml index 8ae5bcbf3c..c39ea738b8 100644 --- a/kubernetes/base/monitoring/kube-prometheus-stack/grafana-mixin.yaml +++ b/kubernetes/base/monitoring/kube-prometheus-stack/grafana-mixin.yaml @@ -47,4 +47,4 @@ spec: timeout: 10m values: additionalLabels: - portefaix.xyz/version: v1.0.0 + portefaix.xyz/version: v0.13.0 diff --git a/kubernetes/base/monitoring/kube-prometheus-stack/kube-prometheus-stack.yaml b/kubernetes/base/monitoring/kube-prometheus-stack/kube-prometheus-stack.yaml index d877fb3c4f..13a92059bb 100644 --- a/kubernetes/base/monitoring/kube-prometheus-stack/kube-prometheus-stack.yaml +++ b/kubernetes/base/monitoring/kube-prometheus-stack/kube-prometheus-stack.yaml @@ -51,7 +51,7 @@ spec: timeout: 20m values: commonLabels: - portefaix.xyz/version: v1.0.0 + portefaix.xyz/version: v0.13.0 defaultRules: runbookUrl: "https://github.com/portefaix/portefaix/tree/master/runbook.md#" @@ -91,7 +91,7 @@ spec: grafana: enabled: true extraLabels: - portefaix.xyz/version: v1.0.0 + portefaix.xyz/version: v0.13.0 defaultDashboardsEnabled: true @@ -563,4 +563,4 @@ spec: nodeExporter: enabled: true podLabels: - portefaix.xyz/version: v1.0.0 + portefaix.xyz/version: v0.13.0 diff --git a/kubernetes/base/monitoring/kube-prometheus-stack/kube-state-metrics-mixin.yaml b/kubernetes/base/monitoring/kube-prometheus-stack/kube-state-metrics-mixin.yaml index 4ba3ed3096..14aeeac9d9 100644 --- a/kubernetes/base/monitoring/kube-prometheus-stack/kube-state-metrics-mixin.yaml +++ b/kubernetes/base/monitoring/kube-prometheus-stack/kube-state-metrics-mixin.yaml @@ -47,4 +47,4 @@ spec: timeout: 10m values: additionalLabels: - portefaix.xyz/version: v1.0.0 + portefaix.xyz/version: v0.13.0 diff --git a/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-mixin.yaml b/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-mixin.yaml index 23fc3958ea..96bd8c7f6d 100644 --- a/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-mixin.yaml +++ b/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-mixin.yaml @@ -47,4 +47,4 @@ spec: timeout: 10m values: additionalLabels: - portefaix.xyz/version: v1.0.0 + portefaix.xyz/version: v0.13.0 diff --git a/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-operator-mixin.yaml b/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-operator-mixin.yaml index 7c0f7e51ab..e6bb3b751e 100644 --- a/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-operator-mixin.yaml +++ b/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-operator-mixin.yaml @@ -47,4 +47,4 @@ spec: timeout: 10m values: additionalLabels: - portefaix.xyz/version: v1.0.0 + portefaix.xyz/version: v0.13.0 diff --git a/kubernetes/base/monitoring/snmp-exporter/snmp-exporter.yaml b/kubernetes/base/monitoring/snmp-exporter/snmp-exporter.yaml index 7fae0b0978..503ba4453b 100644 --- a/kubernetes/base/monitoring/snmp-exporter/snmp-exporter.yaml +++ b/kubernetes/base/monitoring/snmp-exporter/snmp-exporter.yaml @@ -46,6 +46,9 @@ spec: cleanupOnFail: true timeout: 10m values: + # TODO: https://github.com/prometheus-community/helm-charts/pull/1028/ + # customLabels: + # portefaix.xyz/version: v0.13.0 serviceMonitor: enabled: true selector: diff --git a/kubernetes/base/monitoring/thanos/thanos.yaml b/kubernetes/base/monitoring/thanos/thanos.yaml index 2d8bc1c9ae..498154f0cf 100644 --- a/kubernetes/base/monitoring/thanos/thanos.yaml +++ b/kubernetes/base/monitoring/thanos/thanos.yaml @@ -46,10 +46,14 @@ spec: cleanupOnFail: true timeout: 10m values: + # TODO: https://github.com/banzaicloud/banzai-charts/pull/1256 + # customLabels: + # portefaix.xyz/version: v0.13.0 - image: + # image: # repository: quay.io/thanos/thanos # tag: v0.16.0 + objstoreSecretOverride: thanos-objstore-config store: diff --git a/kubernetes/base/multimedia/flood/flood.yaml b/kubernetes/base/multimedia/flood/flood.yaml index d944d651ab..d7d9402036 100644 --- a/kubernetes/base/multimedia/flood/flood.yaml +++ b/kubernetes/base/multimedia/flood/flood.yaml @@ -46,3 +46,6 @@ spec: timeout: 1m cleanupOnFail: true timeout: 10m + values: + controllerLabels: + portefaix.xyz/version: v0.13.0 diff --git a/kubernetes/base/networking/speedtest/speedtest.yaml b/kubernetes/base/networking/speedtest/speedtest.yaml index ef5d05b672..549a411d4a 100644 --- a/kubernetes/base/networking/speedtest/speedtest.yaml +++ b/kubernetes/base/networking/speedtest/speedtest.yaml @@ -47,7 +47,7 @@ spec: timeout: 10m values: additionalLabels: - portefaix.xyz/version: v0.11.0 + portefaix.xyz/version: v0.13.0 additionalAnnotations: a8r.io/description: Prometheus exporter that runs speedtest and exposes results diff --git a/kubernetes/base/storage/nfs/nfs.yaml b/kubernetes/base/storage/nfs/nfs.yaml index 73e6eabe26..6d3497d9a6 100644 --- a/kubernetes/base/storage/nfs/nfs.yaml +++ b/kubernetes/base/storage/nfs/nfs.yaml @@ -33,7 +33,7 @@ spec: targetNamespace: storage values: labels: - portefaix.xyz/version: v0.11.0 + portefaix.xyz/version: v0.13.0 # nfs: # server: xx.xx.xx.xx