mirror of
https://github.com/outbackdingo/cozystack.git
synced 2026-02-05 00:15:51 +00:00
Compare commits
28 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d7914ff9aa | ||
|
|
7f4af5ebbc | ||
|
|
8f575c455c | ||
|
|
819166eb35 | ||
|
|
f507802ec9 | ||
|
|
62267811cb | ||
|
|
12bedef2d3 | ||
|
|
fd240701f8 | ||
|
|
60b96e0a62 | ||
|
|
1d377bab9d | ||
|
|
799690dc07 | ||
|
|
aa02d0c5e6 | ||
|
|
6b8ecf3953 | ||
|
|
e5b81f367e | ||
|
|
ba4798464d | ||
|
|
655e8be382 | ||
|
|
fd9a5b0d7b | ||
|
|
d09314bbb5 | ||
|
|
371791215a | ||
|
|
4c220bb443 | ||
|
|
e27611d45a | ||
|
|
a3e647c547 | ||
|
|
be52fe5461 | ||
|
|
1d639fda0d | ||
|
|
bbdde79428 | ||
|
|
1966f86120 | ||
|
|
fa7c98bc38 | ||
|
|
6671869acc |
4
.github/workflows/pull-requests-release.yaml
vendored
4
.github/workflows/pull-requests-release.yaml
vendored
@@ -51,10 +51,10 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
script: |
|
script: |
|
||||||
const branch = context.payload.pull_request.head.ref;
|
const branch = context.payload.pull_request.head.ref;
|
||||||
const match = branch.match(/^release-(v\d+\.\d+\.\d+(?:[-\w\.]+)?)$/);
|
const match = branch.match(/^release-(\d+\.\d+\.\d+(?:[-\w\.]+)?)$/);
|
||||||
|
|
||||||
if (!match) {
|
if (!match) {
|
||||||
core.setFailed(`Branch '${branch}' does not match expected format 'release-vX.Y.Z[-suffix]'`);
|
core.setFailed(`Branch '${branch}' does not match expected format 'release-X.Y.Z[-suffix]'`);
|
||||||
} else {
|
} else {
|
||||||
const tag = match[1];
|
const tag = match[1];
|
||||||
core.setOutput('tag', tag);
|
core.setOutput('tag', tag);
|
||||||
|
|||||||
5
.github/workflows/tags.yaml
vendored
5
.github/workflows/tags.yaml
vendored
@@ -109,7 +109,7 @@ jobs:
|
|||||||
owner: context.repo.owner,
|
owner: context.repo.owner,
|
||||||
repo: context.repo.repo,
|
repo: context.repo.repo,
|
||||||
issue_number: newPr.data.number,
|
issue_number: newPr.data.number,
|
||||||
labels: ['release', 'ok-to-test']
|
labels: ['release']
|
||||||
});
|
});
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@@ -157,3 +157,6 @@ jobs:
|
|||||||
if: steps.check_release.outputs.skip == 'false'
|
if: steps.check_release.outputs.skip == 'false'
|
||||||
run: |
|
run: |
|
||||||
git push --delete origin ${GITHUB_REF#refs/tags/}
|
git push --delete origin ${GITHUB_REF#refs/tags/}
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: make test
|
||||||
|
|||||||
@@ -357,5 +357,5 @@ kubectl patch -n cozy-system cm/cozystack --type=merge -p '{"data":{
|
|||||||
"oidc-enabled": "true"
|
"oidc-enabled": "true"
|
||||||
}}'
|
}}'
|
||||||
|
|
||||||
timeout 120 sh -c 'until kubectl get hr -n cozy-keycloak keycloak keycloak-configure keycloak-operator; do sleep 1; done'
|
timeout 60 sh -c 'until kubectl get hr -n cozy-keycloak keycloak keycloak-configure keycloak-operator; do sleep 1; done'
|
||||||
kubectl wait --timeout=10m --for=condition=ready -n cozy-keycloak hr keycloak keycloak-configure keycloak-operator
|
kubectl wait --timeout=10m --for=condition=ready -n cozy-keycloak hr keycloak keycloak-configure keycloak-operator
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/nginx-cache:0.4.0@sha256:0f4d8e6863ed074e90f8a7a8390ccd98dae0220119346aba19e85054bb902e2f
|
ghcr.io/cozystack/cozystack/nginx-cache:0.4.0@sha256:bef7344da098c4dc400a9e20ffad10ac991df67d09a30026207454abbc91f28b
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/cluster-autoscaler:0.17.0@sha256:85371c6aabf5a7fea2214556deac930c600e362f92673464fe2443784e2869c3
|
ghcr.io/cozystack/cozystack/cluster-autoscaler:0.17.1@sha256:85371c6aabf5a7fea2214556deac930c600e362f92673464fe2443784e2869c3
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.17.0@sha256:53f4734109799da8b27f35a3b1afdb4746b5992f1d7b9d1c132ea6242cdd8cf0
|
ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.17.1@sha256:795d8e1ef4b2b0df2aa1e09d96cd13476ebb545b4bf4b5779b7547a70ef64cf9
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.17.0@sha256:1a6605d3bff6342e12bcc257e852a4f89e97e8af6d3d259930ec07c7ad5f001d
|
ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.17.1@sha256:d1346d59224e6d2d07f1551af918ed31e57ba84b750122c1aeceaf9b33dd2271
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/ubuntu-container-disk:v1.30.1@sha256:d842de4637ea6188999464f133c89f63a3bd13f1cb202c10f1f8c0c1c3c3dbd4
|
ghcr.io/cozystack/cozystack/ubuntu-container-disk:v1.30.1@sha256:07392e7a87a3d4ef1c86c1b146e6c5de5c2b524aed5a53bf48870dc8a296f99a
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ description: Separated tenant namespace
|
|||||||
icon: /logos/tenant.svg
|
icon: /logos/tenant.svg
|
||||||
|
|
||||||
type: application
|
type: application
|
||||||
version: 1.9.2
|
version: 1.9.1
|
||||||
|
|||||||
@@ -46,8 +46,4 @@ spec:
|
|||||||
resources: {}
|
resources: {}
|
||||||
oncall:
|
oncall:
|
||||||
enabled: false
|
enabled: false
|
||||||
{{- if .Values.ingress }}
|
|
||||||
dependsOn:
|
|
||||||
- name: ingress
|
|
||||||
{{- end }}
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@@ -128,8 +128,7 @@ tenant 1.6.8 bc95159a
|
|||||||
tenant 1.7.0 24fa7222
|
tenant 1.7.0 24fa7222
|
||||||
tenant 1.8.0 160e4e2a
|
tenant 1.8.0 160e4e2a
|
||||||
tenant 1.9.0 728743db
|
tenant 1.9.0 728743db
|
||||||
tenant 1.9.1 de19450f
|
tenant 1.9.1 HEAD
|
||||||
tenant 1.9.2 HEAD
|
|
||||||
virtual-machine 0.1.4 f2015d65
|
virtual-machine 0.1.4 f2015d65
|
||||||
virtual-machine 0.1.5 263e47be
|
virtual-machine 0.1.5 263e47be
|
||||||
virtual-machine 0.2.0 c0685f43
|
virtual-machine 0.2.0 c0685f43
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
cozystack:
|
cozystack:
|
||||||
image: ghcr.io/cozystack/cozystack/installer:v0.29.1@sha256:d63b1cc791ca75d53a7270940189d1401bbeb08f0d54d8ae29dae0ab8a6ef230
|
image: ghcr.io/cozystack/cozystack/installer:v0.30.1@sha256:29b975e1485efa98965d292d772efc11966724fef2f9b70612e398dff0eded5b
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ NAMESPACE=cozy-e2e-tests
|
|||||||
NAME := sandbox
|
NAME := sandbox
|
||||||
CLEAN := 1
|
CLEAN := 1
|
||||||
TESTING_APPS := $(shell find ../../apps -maxdepth 1 -mindepth 1 -type d | awk -F/ '{print $$NF}')
|
TESTING_APPS := $(shell find ../../apps -maxdepth 1 -mindepth 1 -type d | awk -F/ '{print $$NF}')
|
||||||
SANDBOX_NAME := cozy-e2e-sandbox
|
SANDBOX_NAME := cozy-e2e-sandbox-$(shell echo "$$(hostname):$$(pwd)" | sha256sum | cut -c -6)
|
||||||
|
|
||||||
ROOT_DIR = $(dir $(abspath $(firstword $(MAKEFILE_LIST))/../../..))
|
ROOT_DIR = $(dir $(abspath $(firstword $(MAKEFILE_LIST))/../../..))
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
e2e:
|
e2e:
|
||||||
image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.29.1@sha256:f239dc2d06dfe43fb3192531e994bdb10414d42d56d8659b10951bb4fe434f80
|
image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.30.1@sha256:04dcc6161e9bdb4d30538e3706bb29c93c1d615c6f3d940f9af64d3dda2f491e
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/matchbox:v0.29.1@sha256:f0c1d531af04ffde003755df2b6fb2fef9ba0d8355aa55d728de523c623b08a0
|
ghcr.io/cozystack/cozystack/matchbox:v0.30.1@sha256:a30e58f07c702e693f9bc052c3ef6eab443e1db8bcc86689199b2db6af14ebb7
|
||||||
|
|||||||
@@ -3,4 +3,4 @@ name: monitoring
|
|||||||
description: Monitoring and observability stack
|
description: Monitoring and observability stack
|
||||||
icon: /logos/monitoring.svg
|
icon: /logos/monitoring.svg
|
||||||
type: application
|
type: application
|
||||||
version: 1.9.1
|
version: 1.9.2
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/grafana:1.9.1@sha256:24382d445bf7a39ed988ef4dc7a0d9f084db891fcb5f42fd2e64622710b9457e
|
ghcr.io/cozystack/cozystack/grafana:1.9.2@sha256:fb48d37f1a9386e0023df9ac067ec2e03953b7b8c9d6abf2d12716e084f846a4
|
||||||
|
|||||||
@@ -34,7 +34,8 @@ monitoring 1.7.0 2a976afe
|
|||||||
monitoring 1.8.0 8c460528
|
monitoring 1.8.0 8c460528
|
||||||
monitoring 1.8.1 8267072d
|
monitoring 1.8.1 8267072d
|
||||||
monitoring 1.9.0 45a7416c
|
monitoring 1.9.0 45a7416c
|
||||||
monitoring 1.9.1 HEAD
|
monitoring 1.9.1 fd240701
|
||||||
|
monitoring 1.9.2 HEAD
|
||||||
seaweedfs 0.1.0 71514249
|
seaweedfs 0.1.0 71514249
|
||||||
seaweedfs 0.2.0 5fb9cfe3
|
seaweedfs 0.2.0 5fb9cfe3
|
||||||
seaweedfs 0.2.1 fde4bcfa
|
seaweedfs 0.2.1 fde4bcfa
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:6e0a47fb639b27181848d38575577a3cc145486828f50d5fb899e167a3b46c84
|
ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:3537d3baaf96d576148e6df17552f2ead2b7a55ba122ef542a2e99bde896d218
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ cilium:
|
|||||||
mode: "kubernetes"
|
mode: "kubernetes"
|
||||||
image:
|
image:
|
||||||
repository: ghcr.io/cozystack/cozystack/cilium
|
repository: ghcr.io/cozystack/cozystack/cilium
|
||||||
tag: 1.17.1
|
tag: 1.17.2
|
||||||
digest: "sha256:ac154cd13711444f9fd1a7c6e947f504c769cc654039b93630ccc0479111f2a3"
|
digest: "sha256:bc6a8ec326188960ac36584873e07801bcbc56cb862e2ec8bf87a7926f66abf1"
|
||||||
envoy:
|
envoy:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
cozystackAPI:
|
cozystackAPI:
|
||||||
image: ghcr.io/cozystack/cozystack/cozystack-api:v0.29.1@sha256:3ce1cd4a9c74999b08ee477811bdc048a8b3fc79f214d92db2e81bb3ae0bd516
|
image: ghcr.io/cozystack/cozystack/cozystack-api:v0.30.1@sha256:7ef370dc8aeac0a6b2a50b7d949f070eb21d267ba0a70e7fc7c1564bfe6d4f83
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
cozystackController:
|
cozystackController:
|
||||||
image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.29.1@sha256:e06f651a70268d0151c8d475cc1c002a66bb6e60cce7cbe7408403054ed167f7
|
image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.30.1@sha256:5b87a8ea0dcde1671f44532c1ee6db11a5dd922d1a009078ecf6495ec193e52a
|
||||||
debug: false
|
debug: false
|
||||||
disableTelemetry: false
|
disableTelemetry: false
|
||||||
cozystackVersion: "v0.29.1"
|
cozystackVersion: "v0.30.1"
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ data:
|
|||||||
"kubeappsNamespace": {{ .Release.Namespace | quote }},
|
"kubeappsNamespace": {{ .Release.Namespace | quote }},
|
||||||
"helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }},
|
"helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }},
|
||||||
"carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }},
|
"carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }},
|
||||||
"appVersion": "v0.29.1",
|
"appVersion": "v0.30.1",
|
||||||
"authProxyEnabled": {{ .Values.authProxy.enabled }},
|
"authProxyEnabled": {{ .Values.authProxy.enabled }},
|
||||||
"oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }},
|
"oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }},
|
||||||
"oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }},
|
"oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }},
|
||||||
|
|||||||
@@ -18,14 +18,14 @@ kubeapps:
|
|||||||
image:
|
image:
|
||||||
registry: ghcr.io/cozystack/cozystack
|
registry: ghcr.io/cozystack/cozystack
|
||||||
repository: dashboard
|
repository: dashboard
|
||||||
tag: v0.29.1
|
tag: v0.30.1
|
||||||
digest: "sha256:a83fe4654f547469cfa469a02bda1273c54bca103a41eb007fdb2e18a7a91e93"
|
digest: "sha256:a83fe4654f547469cfa469a02bda1273c54bca103a41eb007fdb2e18a7a91e93"
|
||||||
kubeappsapis:
|
kubeappsapis:
|
||||||
image:
|
image:
|
||||||
registry: ghcr.io/cozystack/cozystack
|
registry: ghcr.io/cozystack/cozystack
|
||||||
repository: kubeapps-apis
|
repository: kubeapps-apis
|
||||||
tag: v0.29.1
|
tag: v0.30.1
|
||||||
digest: "sha256:8cc327760c33a15022b847d3fa8d22b87891e17a74dc56f50f52cae032a81d8c"
|
digest: "sha256:5019c8fc4a5d4437cae32a635303ceebcb489c582092fd4bcfc04353b4582233"
|
||||||
pluginConfig:
|
pluginConfig:
|
||||||
flux:
|
flux:
|
||||||
packages:
|
packages:
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ kamaji:
|
|||||||
deploy: false
|
deploy: false
|
||||||
image:
|
image:
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
tag: v0.29.1@sha256:8a1c6c6fe8b680aa48e909ad274ccf97bfcae20729f331e10b0d83038ec972cf
|
tag: v0.30.1@sha256:e6be608afa1aba23309d419cba5406a70fc510dcab8cb399fcd2064c1b48f10e
|
||||||
repository: ghcr.io/cozystack/cozystack/kamaji
|
repository: ghcr.io/cozystack/cozystack/kamaji
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
portSecurity: true
|
portSecurity: true
|
||||||
routes: ""
|
routes: ""
|
||||||
image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.29.1@sha256:03c677712fc07b960cd824fb4595e3919473b483d9a0d76578e2b6a7aba12415
|
image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.30.1@sha256:fa14fa7a0ffa628eb079ddcf6ce41d75b43de92e50f489422f8fb15c4dab2dbf
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
KUBEOVN_TAG = v1.13.6
|
KUBEOVN_TAG = v1.13.8
|
||||||
|
|
||||||
export NAME=kubeovn
|
export NAME=kubeovn
|
||||||
export NAMESPACE=cozy-$(NAME)
|
export NAMESPACE=cozy-$(NAME)
|
||||||
|
|||||||
@@ -15,12 +15,12 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: v1.13.6
|
version: v1.13.8
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application. Versions are not expected to
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
# It is recommended to use it with quotes.
|
# It is recommended to use it with quotes.
|
||||||
appVersion: "1.13.6"
|
appVersion: "1.13.8"
|
||||||
|
|
||||||
kubeVersion: ">= 1.23.0-0"
|
kubeVersion: ">= 1.23.0-0"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ global:
|
|||||||
repository: kube-ovn
|
repository: kube-ovn
|
||||||
dpdkRepository: kube-ovn-dpdk
|
dpdkRepository: kube-ovn-dpdk
|
||||||
vpcRepository: vpc-nat-gateway
|
vpcRepository: vpc-nat-gateway
|
||||||
tag: v1.13.6
|
tag: v1.13.8
|
||||||
support_arm: true
|
support_arm: true
|
||||||
thirdparty: true
|
thirdparty: true
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
# syntax = docker/dockerfile:experimental
|
# syntax = docker/dockerfile:experimental
|
||||||
ARG VERSION=v1.13.6
|
ARG VERSION=v1.13.8
|
||||||
ARG BASE_TAG=$VERSION
|
ARG BASE_TAG=$VERSION
|
||||||
|
|
||||||
FROM golang:1.23-bookworm as builder
|
FROM golang:1.23-bookworm as builder
|
||||||
|
|
||||||
ARG TAG=v1.13.6
|
ARG TAG=v1.13.8
|
||||||
RUN git clone --branch ${TAG} --depth 1 https://github.com/kubeovn/kube-ovn /source
|
RUN git clone --branch ${TAG} --depth 1 https://github.com/kubeovn/kube-ovn /source
|
||||||
|
|
||||||
WORKDIR /source
|
WORKDIR /source
|
||||||
|
|||||||
@@ -22,4 +22,4 @@ global:
|
|||||||
images:
|
images:
|
||||||
kubeovn:
|
kubeovn:
|
||||||
repository: kubeovn
|
repository: kubeovn
|
||||||
tag: v1.13.3@sha256:4e3a9c1b477f12257f509b2bdfb96d2bcf5fcd935d2e4a787e44ab7833121d72
|
tag: v1.13.8@sha256:385329464045cdf5e01364e9f2293edc71065a0910576a8e26ea9ac7097aae71
|
||||||
|
|||||||
@@ -1,19 +1,29 @@
|
|||||||
{{- if .Values.scrapeRules.etcd.enabled }}
|
{{- if .Values.scrapeRules.etcd.enabled }}
|
||||||
|
---
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
metadata:
|
metadata:
|
||||||
name: kube-rbac-proxy
|
name: kube-rbac-proxy
|
||||||
namespace: cozy-monitoring
|
namespace: cozy-monitoring
|
||||||
labels:
|
labels:
|
||||||
app: kube-rbac-proxy
|
app.kubernetes.io/name: etcd
|
||||||
|
app.kubernetes.io/instance: etcd
|
||||||
|
app.kubernetes.io/part-of: control-plane
|
||||||
|
app.kubernetes.io/component: kube-rbac-proxy
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: kube-rbac-proxy
|
app.kubernetes.io/name: etcd
|
||||||
|
app.kubernetes.io/instance: etcd
|
||||||
|
app.kubernetes.io/part-of: control-plane
|
||||||
|
app.kubernetes.io/component: kube-rbac-proxy
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: kube-rbac-proxy
|
app.kubernetes.io/name: etcd
|
||||||
|
app.kubernetes.io/instance: etcd
|
||||||
|
app.kubernetes.io/part-of: control-plane
|
||||||
|
app.kubernetes.io/component: kube-rbac-proxy
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: kube-rbac-proxy
|
serviceAccountName: kube-rbac-proxy
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
@@ -38,7 +48,6 @@ spec:
|
|||||||
runAsNonRoot: true
|
runAsNonRoot: true
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
@@ -46,7 +55,6 @@ metadata:
|
|||||||
namespace: cozy-monitoring
|
namespace: cozy-monitoring
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
metadata:
|
metadata:
|
||||||
@@ -60,7 +68,6 @@ rules:
|
|||||||
verbs: ["create"]
|
verbs: ["create"]
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
@@ -75,15 +82,6 @@ subjects:
|
|||||||
namespace: cozy-monitoring
|
namespace: cozy-monitoring
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: v1
|
|
||||||
kind: ServiceAccount
|
|
||||||
metadata:
|
|
||||||
name: vm-scrape
|
|
||||||
namespace: cozy-monitoring
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
metadata:
|
metadata:
|
||||||
@@ -93,7 +91,6 @@ rules:
|
|||||||
verbs: ["get"]
|
verbs: ["get"]
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
@@ -104,21 +101,10 @@ roleRef:
|
|||||||
name: etcd-metrics-reader
|
name: etcd-metrics-reader
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: vm-scrape
|
name: vmagent-vmagent
|
||||||
namespace: cozy-monitoring
|
namespace: cozy-monitoring
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Secret
|
|
||||||
type: kubernetes.io/service-account-token
|
|
||||||
metadata:
|
|
||||||
name: vm-token
|
|
||||||
annotations:
|
|
||||||
kubernetes.io/service-account.name: vm-scrape
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
apiVersion: operator.victoriametrics.com/v1beta1
|
apiVersion: operator.victoriametrics.com/v1beta1
|
||||||
kind: VMPodScrape
|
kind: VMPodScrape
|
||||||
metadata:
|
metadata:
|
||||||
@@ -129,10 +115,11 @@ spec:
|
|||||||
scheme: https
|
scheme: https
|
||||||
tlsConfig:
|
tlsConfig:
|
||||||
insecureSkipVerify: true
|
insecureSkipVerify: true
|
||||||
bearerTokenSecret:
|
bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
|
||||||
name: vm-token
|
|
||||||
key: token
|
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: kube-rbac-proxy
|
app.kubernetes.io/name: etcd
|
||||||
|
app.kubernetes.io/instance: etcd
|
||||||
|
app.kubernetes.io/part-of: control-plane
|
||||||
|
app.kubernetes.io/component: kube-rbac-proxy
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
Reference in New Issue
Block a user