feat(apps): 应用版本升级
这个提交包含在:
@@ -7,6 +7,7 @@ spec:
|
|||||||
repo: https://halo-sigs.github.io/charts/
|
repo: https://halo-sigs.github.io/charts/
|
||||||
chart: halo
|
chart: halo
|
||||||
targetNamespace: apps
|
targetNamespace: apps
|
||||||
|
# 1.2.3版本报错,暂时回退到1.2.2
|
||||||
version: 1.2.2
|
version: 1.2.2
|
||||||
valuesContent: |-
|
valuesContent: |-
|
||||||
affinity:
|
affinity:
|
||||||
@@ -22,7 +23,7 @@ spec:
|
|||||||
namespaceSelector: {}
|
namespaceSelector: {}
|
||||||
image:
|
image:
|
||||||
repository: halohub/halo-pro
|
repository: halohub/halo-pro
|
||||||
tag: 2.21.9
|
tag: 2.21.10
|
||||||
service:
|
service:
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
ingress:
|
ingress:
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
http:
|
|
||||||
routers:
|
|
||||||
router:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
rule: "Host(`router.dev.cm`)"
|
|
||||||
service: "router@file"
|
|
||||||
middlewares:
|
|
||||||
- web-base
|
|
||||||
vm:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
rule: "Host(`vm.dev.cm`)"
|
|
||||||
service: "vm@file"
|
|
||||||
middlewares:
|
|
||||||
- web-base
|
|
||||||
nas:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
rule: "Host(`nas.dev.cm`)"
|
|
||||||
service: "nas@file"
|
|
||||||
middlewares:
|
|
||||||
- web-base
|
|
||||||
download:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
rule: "Host(`download.dev.cm`)"
|
|
||||||
service: "download@file"
|
|
||||||
middlewares:
|
|
||||||
- traefik-forward-auth
|
|
||||||
- web-base
|
|
||||||
downloadRpc:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
rule: "Host(`download.dev.cm`) && PathPrefix(`/jsonrpc`)"
|
|
||||||
service: "downloadRpc@file"
|
|
||||||
middlewares:
|
|
||||||
- web-base
|
|
||||||
|
|
||||||
services:
|
|
||||||
router:
|
|
||||||
loadBalancer:
|
|
||||||
servers:
|
|
||||||
- url: "https://192.168.21.1/"
|
|
||||||
vm:
|
|
||||||
loadBalancer:
|
|
||||||
servers:
|
|
||||||
- url: "https://192.168.21.2:8006/"
|
|
||||||
nas:
|
|
||||||
loadBalancer:
|
|
||||||
servers:
|
|
||||||
- url: "http://192.168.21.3/"
|
|
||||||
download:
|
|
||||||
loadBalancer:
|
|
||||||
servers:
|
|
||||||
- url: "http://192.168.21.3:6880/"
|
|
||||||
downloadRpc:
|
|
||||||
loadBalancer:
|
|
||||||
servers:
|
|
||||||
- url: "http://192.168.21.3:6800/"
|
|
||||||
@@ -9,7 +9,7 @@ spec:
|
|||||||
repo: https://charts.jetstack.io
|
repo: https://charts.jetstack.io
|
||||||
chart: cert-manager
|
chart: cert-manager
|
||||||
targetNamespace: infra-devops
|
targetNamespace: infra-devops
|
||||||
version: v1.18.2
|
version: v1.19.1
|
||||||
valuesContent: |-
|
valuesContent: |-
|
||||||
affinity:
|
affinity:
|
||||||
nodeAffinity:
|
nodeAffinity:
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ spec:
|
|||||||
repo: https://dl.gitea.com/charts
|
repo: https://dl.gitea.com/charts
|
||||||
chart: gitea
|
chart: gitea
|
||||||
targetNamespace: infra-devops
|
targetNamespace: infra-devops
|
||||||
version: 12.1.3
|
version: 12.3.0
|
||||||
valuesContent: |-
|
valuesContent: |-
|
||||||
affinity:
|
affinity:
|
||||||
podAffinity:
|
podAffinity:
|
||||||
@@ -36,7 +36,7 @@ spec:
|
|||||||
postgresql-ha:
|
postgresql-ha:
|
||||||
enabled: false
|
enabled: false
|
||||||
image:
|
image:
|
||||||
tag: 1.24.5
|
tag: 1.25.1
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
className: nginx
|
className: nginx
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ spec:
|
|||||||
repo: https://emberstack.github.io/helm-charts
|
repo: https://emberstack.github.io/helm-charts
|
||||||
chart: reflector
|
chart: reflector
|
||||||
targetNamespace: infra-devops
|
targetNamespace: infra-devops
|
||||||
version: 9.1.25
|
version: 9.1.38
|
||||||
valuesContent: |-
|
valuesContent: |-
|
||||||
affinity:
|
affinity:
|
||||||
nodeAffinity:
|
nodeAffinity:
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ spec:
|
|||||||
repo: https://vmware-tanzu.github.io/helm-charts
|
repo: https://vmware-tanzu.github.io/helm-charts
|
||||||
chart: velero
|
chart: velero
|
||||||
targetNamespace: infra-devops
|
targetNamespace: infra-devops
|
||||||
version: 10.1.0
|
version: 11.1.1
|
||||||
valuesContent: |-
|
valuesContent: |-
|
||||||
affinity:
|
affinity:
|
||||||
nodeAffinity:
|
nodeAffinity:
|
||||||
@@ -32,7 +32,9 @@ spec:
|
|||||||
backupSyncPeriod: 1h0m0s
|
backupSyncPeriod: 1h0m0s
|
||||||
defaultRepoMaintainFrequency: 3h0m0s
|
defaultRepoMaintainFrequency: 3h0m0s
|
||||||
repositoryMaintenanceJob:
|
repositoryMaintenanceJob:
|
||||||
latestJobsCount: 1
|
repositoryConfigData:
|
||||||
|
global:
|
||||||
|
keepLatestMaintenanceJobs: 1
|
||||||
backupStorageLocation:
|
backupStorageLocation:
|
||||||
- name: devcm-hw
|
- name: devcm-hw
|
||||||
default: true
|
default: true
|
||||||
@@ -53,7 +55,7 @@ spec:
|
|||||||
aws_secret_access_key = ky1n3OlNNu7wjgctVjCqb03HWxjZucRGhvcEBp51
|
aws_secret_access_key = ky1n3OlNNu7wjgctVjCqb03HWxjZucRGhvcEBp51
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: velero-plugin-for-aws
|
- name: velero-plugin-for-aws
|
||||||
image: velero/velero-plugin-for-aws:v1.11.0
|
image: velero/velero-plugin-for-aws:v1.13.0
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /target
|
- mountPath: /target
|
||||||
name: plugins
|
name: plugins
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ spec:
|
|||||||
repo: https://grafana.github.io/helm-charts
|
repo: https://grafana.github.io/helm-charts
|
||||||
chart: loki
|
chart: loki
|
||||||
targetNamespace: infra-monitor
|
targetNamespace: infra-monitor
|
||||||
version: 6.36.1
|
version: 6.46.0
|
||||||
valuesContent: |-
|
valuesContent: |-
|
||||||
deploymentMode: SingleBinary
|
deploymentMode: SingleBinary
|
||||||
gateway:
|
gateway:
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ spec:
|
|||||||
repo: https://prometheus-community.github.io/helm-charts
|
repo: https://prometheus-community.github.io/helm-charts
|
||||||
chart: kube-prometheus-stack
|
chart: kube-prometheus-stack
|
||||||
targetNamespace: infra-monitor
|
targetNamespace: infra-monitor
|
||||||
version: 75.13.0
|
version: 79.2.1
|
||||||
valuesContent: |-
|
valuesContent: |-
|
||||||
kubeControllerManager:
|
kubeControllerManager:
|
||||||
enabled: false
|
enabled: false
|
||||||
@@ -55,6 +55,8 @@ spec:
|
|||||||
- /
|
- /
|
||||||
assertNoLeakedSecrets: false
|
assertNoLeakedSecrets: false
|
||||||
grafana.ini:
|
grafana.ini:
|
||||||
|
public_dashboards:
|
||||||
|
enabled: false
|
||||||
help:
|
help:
|
||||||
enabled: false
|
enabled: false
|
||||||
news:
|
news:
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ spec:
|
|||||||
repo: https://crowdsecurity.github.io/helm-charts
|
repo: https://crowdsecurity.github.io/helm-charts
|
||||||
chart: crowdsec
|
chart: crowdsec
|
||||||
targetNamespace: infra-net
|
targetNamespace: infra-net
|
||||||
version: 0.19.5
|
version: 0.20.1
|
||||||
valuesContent: |-
|
valuesContent: |-
|
||||||
container_runtime: containerd
|
container_runtime: containerd
|
||||||
image:
|
image:
|
||||||
tag: v1.6.11
|
tag: v1.7.3
|
||||||
agent:
|
agent:
|
||||||
affinity:
|
affinity:
|
||||||
podAffinity:
|
podAffinity:
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
apiVersion: helm.cattle.io/v1
|
|
||||||
kind: HelmChart
|
|
||||||
metadata:
|
|
||||||
name: tailscale-derp-sh
|
|
||||||
namespace: infra-net
|
|
||||||
spec:
|
|
||||||
repo: https://devcm-repo.github.io/helm-charts
|
|
||||||
chart: tailscale-derp
|
|
||||||
version: 0.0.9
|
|
||||||
targetNamespace: infra-net
|
|
||||||
valuesContent: |-
|
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/hostname: tcd
|
|
||||||
image:
|
|
||||||
tag: v1.90.6
|
|
||||||
hostNetwork: true
|
|
||||||
extraVolumes:
|
|
||||||
- name: cert-volume
|
|
||||||
secret:
|
|
||||||
secretName: dev-cm-crt
|
|
||||||
items:
|
|
||||||
- key: tls.key
|
|
||||||
path: tcd.node.dev.cm.key
|
|
||||||
- key: tls.crt
|
|
||||||
path: tcd.node.dev.cm.crt
|
|
||||||
extraVolumeMounts:
|
|
||||||
- name: cert-volume
|
|
||||||
mountPath: /certs
|
|
||||||
derp:
|
|
||||||
hostname: 'tcd.node.dev.cm'
|
|
||||||
verify_clients: true
|
|
||||||
http_port: -1
|
|
||||||
https_port: 30443
|
|
||||||
stun_port: 33478
|
|
||||||
certdir: /certs
|
|
||||||
+2
-1
@@ -130,5 +130,6 @@ kubectl taint nodes tca node-role.kubernetes.io/master:NoSchedule
|
|||||||
|
|
||||||
```shell
|
```shell
|
||||||
iptables -A OUTPUT -p udp --dport 41641 -d 47.79.16.80 -j DROP && \
|
iptables -A OUTPUT -p udp --dport 41641 -d 47.79.16.80 -j DROP && \
|
||||||
ip6tables -A OUTPUT -p udp --dport 41641 -d 240b:4001:278:8402:0:3a3d:b8a5:3975 -j DROP
|
ip6tables -A OUTPUT -p udp --dport 41641 -d 240b:4001:278:8402:0:3a3d:b8a5:3975 -j DROP && \
|
||||||
|
ip6tables -A OUTPUT -p udp --dport 41641 -d 2402:4e00:1420:1700:2c34:8fa6:b6ba::/112 -j DROP
|
||||||
```
|
```
|
||||||
|
|||||||
在新议题中引用
屏蔽一个用户