Skip to content

Commit

Permalink
regenerates k8s manifests
Browse files Browse the repository at this point in the history
Signed-off-by: Weifeng Wang <[email protected]>

Update LGTMP stack dependency Helm charts

Signed-off-by: 🤖QC Owl App[bot] <165384878+qc-owl-app[bot]@users.noreply.github.com>

regenerates k8s manifests

Signed-off-by: Weifeng Wang <[email protected]>

update Pyroscope API

Signed-off-by: Weifeng Wang <[email protected]>
  • Loading branch information
qclaogui committed Jul 26, 2024
1 parent 7b2ecf6 commit 2311851
Show file tree
Hide file tree
Showing 14 changed files with 144 additions and 108 deletions.
2 changes: 1 addition & 1 deletion docker-compose/common/compose-include/minio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
metrics.grafana.com/port: 9000
metrics.grafana.com/interval: 15s
metrics.grafana.com/timeout: 10s
image: ${MINIO_IMAGE:-docker.io/minio/minio:RELEASE.2024-06-22T05-26-45Z}
image: ${MINIO_IMAGE:-docker.io/minio/minio:RELEASE.2024-07-16T23-46-41Z}
entrypoint:
- sh
- -euc
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/common/config/.env
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ MIMIR_IMAGE=grafana/mimir-alpine:2.13.0
MIMIRTOOL_IMAGE=grafana/mimirtool:2.13.0
PYROSCOPE_IMAGE=grafana/pyroscope:1.6.1
NGINX_IMAGE=nginxinc/nginx-unprivileged:1.25-alpine
MINIO_IMAGE=minio/minio:RELEASE.2024-06-22T05-26-45Z
MINIO_IMAGE=minio/minio:RELEASE.2024-07-16T23-46-41Z
MEMCACHED_IMAGE=memcached:1.6.27-alpine
MEMCACHED_EXPORTER_IMAGE=prom/memcached-exporter:v0.14.3
INBUCKET_IMAGE=inbucket/inbucket:3.0.4
13 changes: 13 additions & 0 deletions docker-compose/common/config/pyroscope/gateway_pyroscope.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,17 @@ server {
location /querier.v1.QuerierService {
proxy_pass http://${PYROSCOPE_QUERY_FRONTEND_HOST}:4040$request_uri;
}

location /settings.v1.SettingsService/Get {
proxy_pass http://${PYROSCOPE_QUERY_FRONTEND_HOST}:4040$request_uri;
}
location /settings.v1.SettingsService/Set {
proxy_pass http://${PYROSCOPE_QUERY_FRONTEND_HOST}:4040$request_uri;
}
location /pyroscope/render {
proxy_pass http://${PYROSCOPE_QUERY_FRONTEND_HOST}:4040$request_uri;
}
location /pyroscope/render-diff {
proxy_pass http://${PYROSCOPE_QUERY_FRONTEND_HOST}:4040$request_uri;
}
}
38 changes: 19 additions & 19 deletions kubernetes/common/minio-operator/manifests/k8s-all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.min.io/version: v6.0.0
operator.min.io/version: v6.0.1
name: miniojobs.job.min.io
spec:
group: job.min.io
Expand Down Expand Up @@ -1084,7 +1084,7 @@ spec:
x-kubernetes-map-type: atomic
type: array
mcImage:
default: quay.io/minio/mc:RELEASE.2024-07-11T18-01-28Z
default: quay.io/minio/mc:RELEASE.2024-07-16T23-46-41Z
type: string
securityContext:
properties:
Expand Down Expand Up @@ -1209,7 +1209,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.min.io/version: v6.0.0
operator.min.io/version: v6.0.1
name: policybindings.sts.min.io
spec:
group: sts.min.io
Expand Down Expand Up @@ -1342,7 +1342,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.min.io/version: v6.0.0
operator.min.io/version: v6.0.1
name: tenants.minio.min.io
spec:
group: minio.min.io
Expand Down Expand Up @@ -7012,8 +7012,8 @@ kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.0
helm.sh/chart: operator-6.0.0
app.kubernetes.io/version: v6.0.1
helm.sh/chart: operator-6.0.1
name: minio-operator
namespace: minio-system
---
Expand All @@ -7022,8 +7022,8 @@ kind: ClusterRole
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.0
helm.sh/chart: operator-6.0.0
app.kubernetes.io/version: v6.0.1
helm.sh/chart: operator-6.0.1
name: minio-operator-role
rules:
- apiGroups:
Expand Down Expand Up @@ -7206,8 +7206,8 @@ kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.0
helm.sh/chart: operator-6.0.0
app.kubernetes.io/version: v6.0.1
helm.sh/chart: operator-6.0.1
name: minio-operator-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -7223,8 +7223,8 @@ kind: Service
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.0
helm.sh/chart: operator-6.0.0
app.kubernetes.io/version: v6.0.1
helm.sh/chart: operator-6.0.1
name: operator
namespace: minio-system
spec:
Expand All @@ -7242,8 +7242,8 @@ kind: Service
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.0
helm.sh/chart: operator-6.0.0
app.kubernetes.io/version: v6.0.1
helm.sh/chart: operator-6.0.1
name: sts
namespace: minio-system
spec:
Expand All @@ -7260,8 +7260,8 @@ kind: Deployment
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.0
helm.sh/chart: operator-6.0.0
app.kubernetes.io/version: v6.0.1
helm.sh/chart: operator-6.0.1
name: minio-operator
namespace: minio-system
spec:
Expand All @@ -7276,8 +7276,8 @@ spec:
app.kubernetes.io/instance: operator
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: operator
app.kubernetes.io/version: v6.0.0
helm.sh/chart: operator-6.0.0
app.kubernetes.io/version: v6.0.1
helm.sh/chart: operator-6.0.1
spec:
affinity:
podAntiAffinity:
Expand All @@ -7297,7 +7297,7 @@ spec:
value: "on"
- name: OPERATOR_STS_AUTO_TLS_ENABLED
value: "off"
image: quay.io/minio/operator:v6.0.0
image: quay.io/minio/operator:v6.0.1
imagePullPolicy: IfNotPresent
name: operator
resources:
Expand Down
12 changes: 12 additions & 0 deletions kubernetes/common/minio-tenant/configs/add-sm-minio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ spec:
- pod
regex: ".*-0$"
action: keep
- sourceLabels:
- service
regex: "minio"
action: keep
scheme: https
tlsConfig:
insecureSkipVerify: true
Expand All @@ -29,6 +33,10 @@ spec:
sourceLabels:
- job
targetLabel: job
- sourceLabels:
- service
regex: "minio"
action: keep
scheme: https
tlsConfig:
insecureSkipVerify: true
Expand All @@ -39,6 +47,10 @@ spec:
sourceLabels:
- job
targetLabel: job
- sourceLabels:
- service
regex: "minio"
action: keep
scheme: https
tlsConfig:
insecureSkipVerify: true
Expand Down
14 changes: 13 additions & 1 deletion kubernetes/common/minio-tenant/manifests/k8s-all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:
features:
bucketDNS: false
enableSFTP: false
image: quay.io/minio/minio:RELEASE.2024-07-13T01-46-15Z
image: quay.io/minio/minio:RELEASE.2024-07-16T23-46-41Z
imagePullPolicy: IfNotPresent
mountPath: /export
podManagementPolicy: Parallel
Expand Down Expand Up @@ -112,6 +112,10 @@ spec:
regex: .*-0$
sourceLabels:
- pod
- action: keep
regex: minio
sourceLabels:
- service
scheme: https
tlsConfig:
insecureSkipVerify: true
Expand All @@ -122,6 +126,10 @@ spec:
sourceLabels:
- job
targetLabel: job
- action: keep
regex: minio
sourceLabels:
- service
scheme: https
tlsConfig:
insecureSkipVerify: true
Expand All @@ -132,6 +140,10 @@ spec:
sourceLabels:
- job
targetLabel: job
- action: keep
regex: minio
sourceLabels:
- service
scheme: https
tlsConfig:
insecureSkipVerify: true
Expand Down
Loading

0 comments on commit 2311851

Please sign in to comment.