Skip to content

Commit

Permalink
Update: labels for v0.18.0 (#943)
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
  • Loading branch information
nlamirault authored Aug 31, 2021
1 parent 1b15957 commit 122c3f3
Show file tree
Hide file tree
Showing 38 changed files with 51 additions and 44 deletions.
2 changes: 1 addition & 1 deletion kubernetes/base/argo-cd/argo-cd/argo-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
timeout: 10m
values:
# customLabels:
# portefaix.xyz/version: v0.17.0
# portefaix.xyz/version: v0.18.0

installCRDs: false

Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/argo-cd/argo-rollouts/argo-rollouts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
timeout: 10m
values:
# customLabels:
# portefaix.xyz/version: v0.17.0
# portefaix.xyz/version: v0.18.0

installCRDs: false

Expand Down
4 changes: 3 additions & 1 deletion kubernetes/base/chaos-mesh/chaos-mesh/chaos-mesh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ spec:
timeout: 10m
values:
customLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0

timezone: Europe/Paris

dashboard:
create: true
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/dns/external-dns/external-dns.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
targetNamespace: dns
values:
podLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
metrics:
enabled: true
serviceMonitor:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/keda/keda/keda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
values:
# TODO: See https://github.com/kedacore/charts/pull/179
# additionalLabels:
# portefaix.xyz/version: v0.17.0
# portefaix.xyz/version: v0.18.0
logging:
operator:
level: info
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
values:
# TODO: .....
# additionalLabels:
# portefaix.xyz/version: v0.17.0
# portefaix.xyz/version: v0.18.0

# additionalAnnotations:
# a8r.io/description: Secret Store CSI Driver
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/kyverno/kyverno/kyverno.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
timeout: 10m
values:
customLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
serviceMonitor:
enabled: true
additionalLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
targetNamespace: kyverno
values:
# customLabels:
# portefaix.xyz/version: v0.17.0
# portefaix.xyz/version: v0.18.0
ui:
enabled: true

Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/kyverno/portefaix/portefaix-kyverno.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
targetNamespace: policy
values:
customLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
customAnnotations:
a8r.io/description: Kyverno policies for Portefaix
a8r.io/owner: portefaix
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ spec:
cleanupOnFail: true
values:
customLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ spec:
cleanupOnFail: true
values:
customLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
2 changes: 1 addition & 1 deletion kubernetes/base/logging/loki/loki-mixin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
timeout: 10m
values:
additionalLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
app: kube-prometheus-stack
monitoring: portefaix
grafana:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/logging/vector/vector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
targetNamespace: logging
values:
podAnnotations:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0

serviceAccount:
create: true
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/monitoring/grafana/grafana-mixin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
timeout: 10m
values:
additionalLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
app: kube-prometheus-stack
monitoring: portefaix
grafana:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/monitoring/grafana/grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
values:

extraLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0

serviceMonitor:
enabled: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ spec:
timeout: 10m
values:
additionalLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
app: kube-prometheus-stack
monitoring: portefaix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ metadata:
app.kubernetes.io/instance: kube-prometheus-stack
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: kube-prometheus-stack
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
data:
prometheus-datasource.yaml: |
apiVersion: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ spec:
timeout: 20m
values:
commonLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
monitoring: portefaix
defaultRules:
create: false
# runbookUrl: "https://github.com/portefaix/portefaix/tree/master/runbook.md#"
labels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
annotations:
a8r.io/description: Default Prometheus rules
a8r.io/owner: prometheus-community
Expand All @@ -67,7 +67,7 @@ spec:
a8r.io/support: https://github.com/prometheus-community/helm-charts/issues

additionalRuleLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0

alertmanager:
enabled: true
Expand Down Expand Up @@ -123,7 +123,7 @@ spec:
nodeExporter:
enabled: true
podLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0

## Configuration for prometheus-node-exporter subchart
# prometheus-node-exporter:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ spec:
timeout: 10m
values:
additionalLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
app: kube-prometheus-stack
monitoring: portefaix
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
timeout: 10m
values:
additionalLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
app: kube-prometheus-stack
monitoring: portefaix
grafana:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
timeout: 10m
values:
additionalLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
app: kube-prometheus-stack
monitoring: portefaix
grafana:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ spec:
timeout: 10m
values:
additionalLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
app: kube-prometheus-stack
monitoring: portefaix
2 changes: 1 addition & 1 deletion kubernetes/base/monitoring/thanos/thanos-mixin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
timeout: 10m
values:
additionalLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
app: kube-prometheus-stack
monitoring: portefaix
grafana:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/monitoring/thanos/thanos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
timeout: 10m
values:
commonLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0

# image:
# repository: quay.io/thanos/thanos
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/networking/speedtest/speedtest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
timeout: 10m
values:
additionalLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0

additionalAnnotations:
a8r.io/description: Prometheus exporter that runs speedtest and exposes results
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/podinfo/podinfo/podinfo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
timeout: 10m
values:
# customLabels:
# portefaix.xyz/version: v0.17.0
# portefaix.xyz/version: v0.18.0

serviceMonitor:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base/storage/nfs/nfs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
targetNamespace: storage
values:
labels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0

# nfs:
# server: xx.xx.xx.xx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
targetNamespace: kube-system
values:
additionalLabels:
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0

additionalAnnotations:
a8r.io/description: Google Secret Manager Provider for Secret Store CSI Driver
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ metadata:
app.kubernetes.io/instance: chaos-mesh
app.kubernetes.io/part-of: chaos-mesh
app.kubernetes.io/managed-by: Helm
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
name: chaos-dashboard-external
namespace: chaos-mesh
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ metadata:
app.kubernetes.io/instance: litmus
app.kubernetes.io/part-of: litmus-2-0-0-beta
app.kubernetes.io/managed-by: Helm
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
name: litmus-external
namespace: chaos-mesh
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ metadata:
app.kubernetes.io/version: 8.0.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
name: grafana-external
namespace: monitoring
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: server
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
name: argo-cd-argocd-server-external
namespace: argo-cd
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ metadata:
app.kubernetes.io/instance: chaos-mesh
app.kubernetes.io/part-of: chaos-mesh
app.kubernetes.io/managed-by: Helm
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
name: chaos-dashboard-external
namespace: chaos-mesh
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ metadata:
app.kubernetes.io/version: 21.6.2
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: linkerd-viz
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
name: linkerd-dashboard-external
namespace: linkerd-viz
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ metadata:
app.kubernetes.io/instance: litmus
app.kubernetes.io/part-of: litmus-2-0-0-beta
app.kubernetes.io/managed-by: Helm
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
name: litmus-external
namespace: chaos-mesh
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ metadata:
app.kubernetes.io/version: 8.0.1
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: grafana
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
name: grafana-external
namespace: monitoring
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ metadata:
app.kubernetes.io/instance: kube-prometheus-stack
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: kube-prometheus-stack
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
name: kube-prometheus-stack-alertmanager-external
namespace: monitoring
spec:
Expand Down Expand Up @@ -65,7 +65,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: kube-prometheus-stack
helm.sh/chart: kube-prometheus-stack-16.0.0
portefaix.xyz/version: v0.17.0
portefaix.xyz/version: v0.18.0
name: kube-prometheus-stack-prometheus-external
namespace: monitoring
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ spec:
cpu: 25m
memory: 256Mi
chaosDaemon:
# runtime: containerd
resources:
limits:
cpu: 500m
Expand All @@ -37,6 +38,10 @@ spec:
cpu: 250m
memory: 256Mi
dashboard:
persistentVolume:
enabled: true
size: 100Mi
storageClassName: standard
resources:
limits:
cpu: 100m
Expand All @@ -48,9 +53,9 @@ spec:
enabled: true
annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/auth-url: "http://oauth2-proxy.identity.svc.cluster.local/oauth2/auth"
nginx.ingress.kubernetes.io/auth-signin: "http://auth.127.0.0.1.nip.io/oauth2/sign_in?rd=http://$host$request_uri"
# nginx.ingress.kubernetes.io/auth-url: "http://oauth2-proxy.identity.svc.cluster.local/oauth2/auth"
# nginx.ingress.kubernetes.io/auth-signin: "http://auth.127.0.0.1.nip.io/oauth2/sign_in?rd=http://$host$request_uri"
hosts:
- name: chaos-mesh.127.0.0.1.nip.io
path: /
path: ["/"]
# pathType: Prefix

0 comments on commit 122c3f3

Please sign in to comment.