Skip to content

Commit 7cc2267

Browse files
wuhuizuowuhuizuo
committed
feat(prod2): add publisher and Kafka
1 parent 814793c commit 7cc2267

21 files changed

+490
-6
lines changed

apps/prod2/zot/policies.yaml renamed to apps/prod2/cluster-policies/avoid-application-pods-run-on-arm64-nodes.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
apiVersion: kyverno.io/v1
2-
kind: Policy
2+
kind: ClusterPolicy
33
metadata:
4-
name: restrict-to-amd64-nodes
4+
name: avoid-application-pods-run-on-arm64-nodes
55
spec:
66
rules:
7-
- name: restrict-to-amd64-nodes
7+
- name: inject-node-affinity
88
match:
99
resources:
1010
kinds:
1111
- Pod
12+
namespaces:
13+
- brc
14+
- buildbarn
15+
- jenkins-beta
16+
- kafka
17+
- publisher
18+
- tekton-operator
19+
- tekton-pipelines
20+
- zot
1221
mutate:
1322
patchStrategicMerge:
1423
spec:

‎apps/prod2/cluster-policies/kustomization.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- avoid-application-pods-run-on-arm64-nodes.yaml

‎apps/prod2/kustomization.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
44
- ../_base
5-
- buildbarn # experiment
5+
- cluster-policies
66
- brc
7+
- tekton
8+
- publisher
79
- zot # experiment
10+
- buildbarn # experiment
811
- jenkins/beta # experiment
9-
- tekton

‎apps/prod2/publisher/kustomization.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
namespace: publisher
4+
resources:
5+
- namespace.yaml
6+
- pre.yaml
7+
- release-prod-mirror.yaml
8+
- release-staging-mirror.yaml

‎apps/prod2/publisher/namespace.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: publisher

‎apps/prod2/publisher/pre.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
3+
kind: Kustomization
4+
metadata:
5+
name: publisher-pre
6+
spec:
7+
interval: 5m0s
8+
sourceRef:
9+
kind: GitRepository
10+
name: flux-system
11+
namespace: flux-system
12+
path: ./apps/prod2/publisher/pre
13+
prune: true

‎apps/prod2/publisher/pre/external-secrets/kustomization.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- publisher-config-prod.yaml
5+
- publisher-config-staging.yaml
6+
- tiup-credentials-prod.yaml
7+
- tiup-credentials-staging.yaml

‎apps/prod2/publisher/pre/external-secrets/publisher-config-prod.yaml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
apiVersion: external-secrets.io/v1
2+
kind: ExternalSecret
3+
metadata:
4+
name: publisher-config-prod
5+
spec:
6+
secretStoreRef:
7+
kind: ClusterSecretStore
8+
name: ee-gcp-sm
9+
target:
10+
name: publisher-config-prod
11+
creationPolicy: Owner
12+
template:
13+
type: Opaque
14+
data:
15+
service.yaml: |
16+
event_source: "http://publisher-prod.apps.svc"
17+
kafka:
18+
brokers:
19+
- cluster-cd-kafka-bootstrap.kafka.svc:9092
20+
topic: cd-publishing-requests-prod
21+
client_id: publisher-prod
22+
redis:
23+
addr: "redis-master.redis:6379"
24+
db: 0
25+
password: {{ .data.redis_password }}
26+
worker.yaml: |
27+
tiup:
28+
kafka:
29+
brokers:
30+
- cluster-cd-kafka-bootstrap.kafka.svc:9092
31+
topic: cd-publishing-requests-prod
32+
consumer_group: publisher-prod-tiup
33+
34+
options:
35+
mirror_url: {{ .data.tiup_mirror_url}}
36+
lark_webhook_url: {{ .data.lark_webhook_url }}
37+
nightly_interval: 12h
38+
redis:
39+
addr: "redis-master.redis:6379"
40+
db: 0
41+
password: {{ .data.redis_password }}
42+
data:
43+
- secretKey: redis_password
44+
remoteRef:
45+
key: prod2_publisher_redis_password
46+
- secretKey: tiup-prod-mirror-url
47+
remoteRef:
48+
key: prod2_publisher_redis_password
49+
- secretKey: lark_webhook_url
50+
remoteRef:
51+
key: prod2_publisher_failure_lark_webhook_url

‎apps/prod2/publisher/pre/external-secrets/publisher-config-staging.yaml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
apiVersion: external-secrets.io/v1
2+
kind: ExternalSecret
3+
metadata:
4+
name: publisher-config-staging
5+
spec:
6+
secretStoreRef:
7+
kind: ClusterSecretStore
8+
name: ee-gcp-sm
9+
target:
10+
name: publisher-config-staging
11+
creationPolicy: Owner
12+
template:
13+
type: Opaque
14+
data:
15+
service.yaml: |
16+
event_source: "http://publisher-staging.apps.svc"
17+
kafka:
18+
brokers:
19+
- cluster-cd-kafka-bootstrap.kafka.svc:9092
20+
topic: cd-publishing-requests-staging
21+
client_id: publisher-staging
22+
redis:
23+
addr: "redis-master.redis:6379"
24+
db: 0
25+
password: {{ .data.redis_password }}
26+
worker.yaml: |
27+
tiup:
28+
kafka:
29+
brokers:
30+
- cluster-cd-kafka-bootstrap.kafka.svc:9092
31+
topic: cd-publishing-requests-staging
32+
consumer_group: publisher-staging-tiup
33+
34+
options:
35+
mirror_url: {{ .data.tiup_mirror_url}}
36+
lark_webhook_url: {{ .data.lark_webhook_url }}
37+
nightly_interval: 12h
38+
redis:
39+
addr: "redis-master.redis:6379"
40+
db: 0
41+
password: {{ .data.redis_password }}
42+
43+
file_server:
44+
kafka:
45+
brokers:
46+
- cluster-cd-kafka-bootstrap.kafka.svc:9092
47+
topic: cd-publishing-requests-staging
48+
consumer_group: publisher-staging-fs
49+
50+
redis:
51+
addr: "redis-master.redis:6379"
52+
db: 0
53+
password: {{ .data.redis_password }}
54+
55+
options:
56+
lark_webhook_url: {{ .data.lark_webhook_url }}
57+
s3.endpoint: {{ .data.S3_REGION_ENDPOINT }}
58+
s3.region: {{ .data.S3_REGION }}
59+
s3.bucket_name: {{ .data.S3_BUCKET }}
60+
s3.access_key: {{ .data.S3_ACCESS_KEY }}
61+
s3.secret_key: {{ .data.S3_SECRET_KEY }}
62+
63+
data:
64+
- secretKey: redis_password
65+
remoteRef:
66+
key: prod2_publisher_redis_password
67+
- secretKey: tiup-prod-mirror-url
68+
remoteRef:
69+
key: prod2_publisher_redis_password
70+
- secretKey: lark_webhook_url
71+
remoteRef:
72+
key: prod2_publisher_failure_lark_webhook_url
73+
dataFrom:
74+
- extract:
75+
# json object contains keys: S3_*
76+
key: prod2_publisher_fileserver_s3_json

‎apps/prod2/publisher/pre/external-secrets/tiup-credentials-prod.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: external-secrets.io/v1
2+
kind: ExternalSecret
3+
metadata:
4+
name: tiup-credentials-prod
5+
spec:
6+
secretStoreRef:
7+
kind: ClusterSecretStore
8+
name: ee-gcp-sm
9+
target:
10+
name: tiup-credentials-prod
11+
creationPolicy: Owner
12+
data:
13+
- secretKey: url
14+
remoteRef:
15+
key: tiup-prod-mirror-url
16+
- secretKey: private.json
17+
remoteRef:
18+
key: tiup-prod-private-key-json

0 commit comments

Comments
 (0)