feat(gitops): migrate resources to infra-gitops namespace and update Helm chart versions

这个提交包含在:
2026-02-04 19:14:41 +08:00 未验证
父节点 0bbdd77252
当前提交 f900578b74
修改 14 个文件,包含 103 行新增14 行删除
+1 -1
查看文件
@@ -22,7 +22,7 @@ spec:
namespaceSelector: {} namespaceSelector: {}
image: image:
repository: halohub/halo-pro repository: halohub/halo-pro
tag: 2.22.12 tag: 2.22.13
service: service:
type: ClusterIP type: ClusterIP
ingress: ingress:
@@ -2,7 +2,7 @@ apiVersion: fluxcd.controlplane.io/v1
kind: FluxInstance kind: FluxInstance
metadata: metadata:
name: flux name: flux
namespace: flux-system namespace: infra-gitops
spec: spec:
distribution: distribution:
version: "2.x" version: "2.x"
@@ -19,4 +19,7 @@ spec:
size: small size: small
multitenant: false multitenant: false
networkPolicy: true networkPolicy: true
domain: "cluster.local" domain: "cluster.local"
storage:
class: "local-path"
size: "10Gi"
+34
查看文件
@@ -0,0 +1,34 @@
apiVersion: helm.cattle.io/v1
kind: HelmChart
metadata:
name: flux-operator
namespace: infra-gitops
spec:
chart: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator
targetNamespace: infra-gitops
version: 0.40.0
valuesContent: |-
installCRDs: true
web:
config:
baseURL: https://cd.dev.cm
authentication:
type: OAuth2
oauth2:
provider: OIDC
issuerURL: https://git.dev.cm
clientID: "94b1ec99-55c4-4621-89c3-f49d8b7d5603"
clientSecret: "gto_5fmpkf6h7zohbpesnxfuvjvppinunayv7mfcyo2wmuzqtuj3ig2a"
networkPolicy:
create: false
ingress:
enabled: true
className: nginx
hosts:
- host: cd.dev.cm
paths:
- path: /
pathType: Prefix
+22
查看文件
@@ -0,0 +1,22 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-flux-operator
namespace: infra-gitops
spec:
podSelector:
matchLabels:
app.kubernetes.io/name: flux-operator
ingress:
- from:
- podSelector: {}
- ipBlock:
cidr: 100.0.0.0/8
ports:
- port: 9080
protocol: TCP
egress:
- {}
policyTypes:
- Ingress
- Egress
@@ -2,7 +2,7 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: gitea-actions-dind-config name: gitea-actions-dind-config
namespace: infra-devops namespace: infra-gitops
data: data:
daemon.json: |- daemon.json: |-
{ {
@@ -2,7 +2,7 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: gitea-custom-templates name: gitea-custom-templates
namespace: infra-devops namespace: infra-gitops
data: data:
home.tmpl: |- home.tmpl: |-
{{template "base/head" .}} {{template "base/head" .}}
@@ -2,11 +2,11 @@ apiVersion: helm.cattle.io/v1
kind: HelmChart kind: HelmChart
metadata: metadata:
name: gitea-actions name: gitea-actions
namespace: infra-devops namespace: infra-gitops
spec: spec:
repo: https://dl.gitea.com/charts repo: https://dl.gitea.com/charts
chart: actions chart: actions
targetNamespace: infra-devops targetNamespace: infra-gitops
version: 0.0.2 version: 0.0.2
valuesContent: |- valuesContent: |-
enabled: true enabled: true
@@ -36,7 +36,7 @@ spec:
name: gitea-actions-dind-config name: gitea-actions-dind-config
persistence: persistence:
size: 10Gi size: 10Gi
giteaRootURL: http://gitea-http.infra-devops.svc.cluster.local:3000 giteaRootURL: http://gitea-http.infra-gitops.svc.cluster.local:3000
existingSecret: gitea-actions existingSecret: gitea-actions
existingSecretKey: token existingSecretKey: token
@@ -2,11 +2,11 @@ apiVersion: helm.cattle.io/v1
kind: HelmChart kind: HelmChart
metadata: metadata:
name: gitea name: gitea
namespace: infra-devops namespace: infra-gitops
spec: spec:
repo: https://dl.gitea.com/charts repo: https://dl.gitea.com/charts
chart: gitea chart: gitea
targetNamespace: infra-devops targetNamespace: infra-gitops
version: 12.3.0 version: 12.3.0
valuesContent: |- valuesContent: |-
affinity: affinity:
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: gitea-static name: gitea-static
namespace: infra-devops namespace: infra-gitops
annotations: annotations:
nginx.ingress.kubernetes.io/use-regex: "true" nginx.ingress.kubernetes.io/use-regex: "true"
nginx.ingress.kubernetes.io/proxy-buffering: "on" nginx.ingress.kubernetes.io/proxy-buffering: "on"
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: gitea-ssh-lb name: gitea-ssh-lb
namespace: infra-devops namespace: infra-gitops
spec: spec:
selector: selector:
app.kubernetes.io/name: gitea app.kubernetes.io/name: gitea
@@ -0,0 +1,24 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-gitea
namespace: infra-gitops
spec:
podSelector:
matchLabels:
app.kubernetes.io/name: gitea
ingress:
- from:
- podSelector: {}
- ipBlock:
cidr: 100.0.0.0/8
ports:
- port: 3000
protocol: TCP
- port: 2222
protocol: TCP
egress:
- {}
policyTypes:
- Ingress
- Egress
+4
查看文件
@@ -0,0 +1,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: infra-gitops
+3 -1
查看文件
@@ -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: 81.0.0 version: 81.5.0
valuesContent: |- valuesContent: |-
kubeControllerManager: kubeControllerManager:
enabled: false enabled: false
@@ -55,6 +55,8 @@ spec:
- / - /
assertNoLeakedSecrets: false assertNoLeakedSecrets: false
grafana.ini: grafana.ini:
server:
root_url: https://monitor.dev.cm/
public_dashboards: public_dashboards:
enabled: false enabled: false
help: help:
+1 -1
查看文件
@@ -65,7 +65,7 @@ metadata:
namespace: infra-net namespace: infra-net
spec: spec:
type: ExternalName type: ExternalName
externalName: gitea-http.infra-devops.svc.cluster.local externalName: gitea-http.infra-gitops.svc.cluster.local
--- ---
apiVersion: v1 apiVersion: v1