Merge branch 'main' into renovate/thanos
This commit is contained in:
commit
55069f0dbb
5 changed files with 68 additions and 61 deletions
|
@ -10,7 +10,7 @@ spec:
|
|||
chart:
|
||||
spec:
|
||||
chart: app-template
|
||||
version: 2.0.1
|
||||
version: 2.0.2
|
||||
interval: 30m
|
||||
sourceRef:
|
||||
kind: HelmRepository
|
||||
|
|
|
@ -11,7 +11,7 @@ spec:
|
|||
chart:
|
||||
spec:
|
||||
chart: kube-prometheus-stack
|
||||
version: 51.2.0
|
||||
version: 51.3.0
|
||||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: prometheus-community
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
---
|
||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json
|
||||
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
||||
kind: HelmRelease
|
||||
metadata:
|
||||
|
@ -9,7 +10,7 @@ spec:
|
|||
chart:
|
||||
spec:
|
||||
chart: app-template
|
||||
version: 1.5.1
|
||||
version: 2.0.2
|
||||
interval: 30m
|
||||
sourceRef:
|
||||
kind: HelmRepository
|
||||
|
@ -17,10 +18,13 @@ spec:
|
|||
namespace: flux-system
|
||||
|
||||
values:
|
||||
controllers:
|
||||
main:
|
||||
containers:
|
||||
main:
|
||||
image:
|
||||
repository: ghcr.io/mendhak/http-https-echo
|
||||
tag: "30@sha256:b6fccf52c73a5786b2e79e06e5c86d4689416d0ea41a6477af6ad89c1d81933f"
|
||||
|
||||
tag: "30"
|
||||
env:
|
||||
HTTP_PORT: &port 8080
|
||||
LOG_WITHOUT_NEWLINE: "true"
|
||||
|
@ -35,13 +39,16 @@ spec:
|
|||
ingress:
|
||||
main:
|
||||
enabled: true
|
||||
ingressClassName: "nginx"
|
||||
className: "nginx"
|
||||
annotations:
|
||||
external-dns.alpha.kubernetes.io/target: "ingress.valinor.social"
|
||||
hosts:
|
||||
- host: &host "echo-server.valinor.social"
|
||||
paths:
|
||||
- path: /
|
||||
service:
|
||||
name: main
|
||||
port: http
|
||||
tls:
|
||||
- hosts:
|
||||
- *host
|
||||
|
|
|
@ -10,7 +10,7 @@ spec:
|
|||
chart:
|
||||
spec:
|
||||
chart: app-template
|
||||
version: 2.0.1
|
||||
version: 2.0.2
|
||||
interval: 30m
|
||||
sourceRef:
|
||||
kind: HelmRepository
|
||||
|
@ -18,25 +18,24 @@ spec:
|
|||
namespace: flux-system
|
||||
|
||||
values:
|
||||
controller:
|
||||
annotations:
|
||||
reloader.stakater.com/auto: "true"
|
||||
env:
|
||||
OP_BUS_PORT: "11220"
|
||||
OP_BUS_PEERS: "localhost:11221"
|
||||
OP_HTTP_PORT: &port 8080
|
||||
OP_SESSION:
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: onepassword-connect-secret
|
||||
key: onepassword-credentials.json
|
||||
controllers:
|
||||
main:
|
||||
annotations:
|
||||
reloader.stakater.com/auto: "true"
|
||||
containers:
|
||||
main:
|
||||
image:
|
||||
repository: docker.io/1password/connect-api
|
||||
tag: 1.7.2
|
||||
env:
|
||||
OP_BUS_PORT: "11220"
|
||||
OP_BUS_PEERS: "localhost:11221"
|
||||
OP_HTTP_PORT: &port-connect 8080
|
||||
OP_SESSION:
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: onepassword-connect-secret
|
||||
key: onepassword-credentials.json
|
||||
probes:
|
||||
liveness:
|
||||
enabled: true
|
||||
|
@ -44,7 +43,7 @@ spec:
|
|||
spec:
|
||||
httpGet:
|
||||
path: /heartbeat
|
||||
port: *port
|
||||
port: *port-connect
|
||||
initialDelaySeconds: 15
|
||||
periodSeconds: 30
|
||||
failureThreshold: 3
|
||||
|
@ -54,7 +53,7 @@ spec:
|
|||
spec:
|
||||
httpGet:
|
||||
path: /health
|
||||
port: *port
|
||||
port: *port-connect
|
||||
initialDelaySeconds: 15
|
||||
startup:
|
||||
enabled: true
|
||||
|
@ -62,14 +61,15 @@ spec:
|
|||
spec:
|
||||
httpGet:
|
||||
path: /health
|
||||
port: *port
|
||||
port: *port-connect
|
||||
failureThreshold: 30
|
||||
periodSeconds: 5
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 1
|
||||
sync:
|
||||
name: sync
|
||||
image: docker.io/1password/connect-sync:1.7.2@sha256:fe527ed9d81f193d8dfbba4140d61f9e8c8dceb0966b3009259087504e5ff79c
|
||||
image:
|
||||
repository: docker.io/1password/connect-sync
|
||||
tag: 1.7.2
|
||||
env:
|
||||
- name: OP_SESSION
|
||||
valueFrom:
|
||||
|
@ -77,7 +77,7 @@ spec:
|
|||
name: onepassword-connect-secret
|
||||
key: onepassword-credentials.json
|
||||
- name: OP_HTTP_PORT
|
||||
value: &port 8081
|
||||
value: &port-sync 8081
|
||||
- name: OP_BUS_PORT
|
||||
value: "11221"
|
||||
- name: OP_BUS_PEERS
|
||||
|
@ -86,12 +86,12 @@ spec:
|
|||
readinessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
port: *port
|
||||
port: *port-sync
|
||||
initialDelaySeconds: 15
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /heartbeat
|
||||
port: *port
|
||||
port: *port-sync
|
||||
failureThreshold: 3
|
||||
periodSeconds: 30
|
||||
initialDelaySeconds: 15
|
||||
|
@ -103,7 +103,7 @@ spec:
|
|||
main:
|
||||
ports:
|
||||
http:
|
||||
port: *port
|
||||
port: *port-connect
|
||||
|
||||
ingress:
|
||||
main:
|
||||
|
|
|
@ -9,7 +9,7 @@ spec:
|
|||
chart:
|
||||
spec:
|
||||
chart: reloader
|
||||
version: 1.0.41
|
||||
version: 1.0.42
|
||||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: stakater
|
||||
|
|
Reference in a new issue