feat(infra): rename infra-data resources and update dependencies for post-1 and post-2
这个提交包含在:
@@ -13,6 +13,6 @@ spec:
|
||||
path: ./flux/apps
|
||||
prune: true
|
||||
dependsOn:
|
||||
- name: infra-data-reflector
|
||||
- name: infra-data-post-2
|
||||
- name: infra-net
|
||||
- name: infra-gitops
|
||||
|
||||
@@ -21,7 +21,7 @@ spec:
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
metadata:
|
||||
name: infra-data-post
|
||||
name: infra-data-post-1
|
||||
namespace: infra-gitops
|
||||
spec:
|
||||
interval: 30m
|
||||
@@ -30,7 +30,7 @@ spec:
|
||||
sourceRef:
|
||||
kind: GitRepository
|
||||
name: flux
|
||||
path: ./flux/infrastructure/infra-data/post
|
||||
path: ./flux/infrastructure/infra-data/post-1
|
||||
prune: true
|
||||
force: true
|
||||
wait: true
|
||||
@@ -41,7 +41,7 @@ spec:
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
metadata:
|
||||
name: infra-data-reflector
|
||||
name: infra-data-post-2
|
||||
namespace: infra-gitops
|
||||
spec:
|
||||
interval: 30m
|
||||
@@ -50,9 +50,9 @@ spec:
|
||||
sourceRef:
|
||||
kind: GitRepository
|
||||
name: flux
|
||||
path: ./flux/infrastructure/infra-data/reflector
|
||||
path: ./flux/infrastructure/infra-data/post-2
|
||||
prune: true
|
||||
force: true
|
||||
wait: true
|
||||
dependsOn:
|
||||
- name: infra-data-post
|
||||
- name: infra-data-post-1
|
||||
|
||||
@@ -14,7 +14,7 @@ spec:
|
||||
prune: true
|
||||
wait: true
|
||||
dependsOn:
|
||||
- name: infra-data-reflector
|
||||
- name: infra-data-post-2
|
||||
- name: infra-monitor
|
||||
|
||||
---
|
||||
|
||||
@@ -15,7 +15,7 @@ spec:
|
||||
force: true
|
||||
wait: true
|
||||
dependsOn:
|
||||
- name: infra-data-reflector
|
||||
- name: infra-data-post-2
|
||||
|
||||
---
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ../../../infrastructure/infra-data/post/cnpg17-objectstore-hw.yaml
|
||||
- ../../../infrastructure/infra-data/post-1/cnpg17-objectstore-hw.yaml
|
||||
- cnpg17-cluster-hk.yaml
|
||||
- cnpg17-cluster-sh.yaml
|
||||
- databases.yaml
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
metadata:
|
||||
name: infra-data-post
|
||||
name: infra-data-post-1
|
||||
spec:
|
||||
path: ./flux/clusters/dev-cm/infra-data-post
|
||||
path: ./flux/clusters/dev-cm/infra-data-post-1
|
||||
patches:
|
||||
- target:
|
||||
kind: Cluster
|
||||
@@ -0,0 +1,6 @@
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
metadata:
|
||||
name: infra-data-post-2
|
||||
spec:
|
||||
path: ./flux/clusters/dev-cm/infra-data-post-2
|
||||
@@ -14,15 +14,15 @@ patches:
|
||||
- target:
|
||||
kind: Kustomization
|
||||
name: infra-data
|
||||
path: patches/infra-data.yaml
|
||||
path: infra-data/patch.yaml
|
||||
- target:
|
||||
kind: Kustomization
|
||||
name: infra-data-post
|
||||
path: patches/infra-data-post.yaml
|
||||
name: infra-data-post-1
|
||||
path: infra-data-post-1/patch.yaml
|
||||
- target:
|
||||
kind: Kustomization
|
||||
name: infra-data-reflector
|
||||
path: patches/infra-data-reflector.yaml
|
||||
name: infra-data-post-2
|
||||
path: infra-data-post-2/patch.yaml
|
||||
- target:
|
||||
kind: Kustomization
|
||||
name: infra-net
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
metadata:
|
||||
name: infra-data-reflector
|
||||
spec:
|
||||
path: ./flux/clusters/dev-cm/infra-data-reflector
|
||||
在新议题中引用
屏蔽一个用户