Skip to content
This repository was archived by the owner on Mar 24, 2023. It is now read-only.

Commit 7c07a65

Browse files
Rob0hRob0h
authored
Move list yaml splitting to render (#712)
1 parent c79b88d commit 7c07a65

39 files changed

+1368
-516
lines changed

‎integration/init/cockroach/expected/.ship/state.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
"config": {},
44
"releaseName": "ship",
55
"upstream": "https://raw.githubusercontent.com/cockroachdb/cockroach/v2.0.6/cloud/kubernetes/cockroachdb-statefulset-secure.yaml",
6-
"metadata": {
7-
"applicationType": "",
8-
"releaseNotes": "",
9-
"version": ""
10-
},
6+
"metadata": null,
117
"contentSHA": "4e8ef4ad3601ea5b1970b22010af6b21bc6f16d849cb3af0e973cf2447f79009"
128
}
139
}

‎integration/init/git-single-file-gogetter/expected/.ship/state.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
"config": {},
44
"releaseName": "ship",
55
"upstream": "github.com/replicatedhq/test-charts/blob/3427d6997bd150c60caa00ba0298fdfe17e3ed04/plain-k8s/frontend-deployment.yaml",
6-
"metadata": {
7-
"applicationType": "",
8-
"releaseNotes": "",
9-
"version": ""
10-
},
6+
"metadata": null,
117
"contentSHA": "9fa025c3fdbcc02c7de8e9c74c8058d16b2aada04917895685504b387563afda"
128
}
139
}

‎integration/init/git-single-file/expected/.ship/state.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
"config": {},
44
"releaseName": "ship",
55
"upstream": "github.com/replicatedhq/test-charts/blob/3427d6997bd150c60caa00ba0298fdfe17e3ed04/plain-k8s/frontend-deployment.yaml",
6-
"metadata": {
7-
"applicationType": "",
8-
"releaseNotes": "",
9-
"version": ""
10-
},
6+
"metadata": null,
117
"contentSHA": "9fa025c3fdbcc02c7de8e9c74c8058d16b2aada04917895685504b387563afda"
128
}
139
}

‎integration/init/jaeger-cassandra/expected/.ship/state.json

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
"v1": {
3+
"config": {},
4+
"releaseName": "ship",
5+
"upstream": "__upstream__",
6+
"metadata": {
7+
"applicationType": "",
8+
"releaseNotes": "",
9+
"version": "",
10+
"lists": [
11+
{
12+
"apiVersion": "v1",
13+
"path": "installer/base/cassandra.yml",
14+
"items": [
15+
{
16+
"kind": "Service",
17+
"metadata": {
18+
"name": "cassandra",
19+
"namespace": ""
20+
}
21+
},
22+
{
23+
"kind": "StatefulSet",
24+
"metadata": {
25+
"name": "cassandra",
26+
"namespace": ""
27+
}
28+
},
29+
{
30+
"kind": "Job",
31+
"metadata": {
32+
"name": "jaeger-cassandra-schema-job",
33+
"namespace": ""
34+
}
35+
}
36+
]
37+
},
38+
{
39+
"apiVersion": "v1",
40+
"path": "installer/base/jaeger-production-template.yml",
41+
"items": [
42+
{
43+
"kind": "Deployment",
44+
"metadata": {
45+
"name": "jaeger-collector",
46+
"namespace": ""
47+
}
48+
},
49+
{
50+
"kind": "Service",
51+
"metadata": {
52+
"name": "jaeger-collector",
53+
"namespace": ""
54+
}
55+
},
56+
{
57+
"kind": "Service",
58+
"metadata": {
59+
"name": "zipkin",
60+
"namespace": ""
61+
}
62+
},
63+
{
64+
"kind": "Deployment",
65+
"metadata": {
66+
"name": "jaeger-query",
67+
"namespace": ""
68+
}
69+
},
70+
{
71+
"kind": "Service",
72+
"metadata": {
73+
"name": "jaeger-query",
74+
"namespace": ""
75+
}
76+
},
77+
{
78+
"kind": "DaemonSet",
79+
"metadata": {
80+
"name": "jaeger-agent",
81+
"namespace": ""
82+
}
83+
}
84+
]
85+
}
86+
]
87+
},
88+
"contentSHA": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
89+
}
90+
}

‎integration/init/jaeger-cassandra/expected/installer/base/DaemonSet-jaeger-agent.yaml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
apiVersion: extensions/v1beta1
2+
kind: DaemonSet
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: agent-daemonset
7+
name: jaeger-agent
8+
spec:
9+
template:
10+
metadata:
11+
annotations:
12+
prometheus.io/port: "5778"
13+
prometheus.io/scrape: "true"
14+
labels:
15+
app: jaeger
16+
jaeger-infra: agent-instance
17+
spec:
18+
containers:
19+
- args:
20+
- --config-file=/conf/agent.yaml
21+
image: jaegertracing/jaeger-agent:1.7.0
22+
name: agent-instance
23+
ports:
24+
- containerPort: 5775
25+
protocol: UDP
26+
- containerPort: 6831
27+
protocol: UDP
28+
- containerPort: 6832
29+
protocol: UDP
30+
- containerPort: 5778
31+
protocol: TCP
32+
volumeMounts:
33+
- mountPath: /conf
34+
name: jaeger-configuration-volume
35+
dnsPolicy: ClusterFirstWithHostNet
36+
hostNetwork: true
37+
volumes:
38+
- configMap:
39+
items:
40+
- key: agent
41+
path: agent.yaml
42+
name: jaeger-configuration
43+
name: jaeger-configuration-volume

‎integration/init/jaeger-cassandra/expected/installer/base/Deployment-jaeger-collector.yaml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
apiVersion: extensions/v1beta1
2+
kind: Deployment
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: collector-deployment
7+
name: jaeger-collector
8+
spec:
9+
replicas: 1
10+
strategy:
11+
type: Recreate
12+
template:
13+
metadata:
14+
annotations:
15+
prometheus.io/port: "14268"
16+
prometheus.io/scrape: "true"
17+
labels:
18+
app: jaeger
19+
jaeger-infra: collector-pod
20+
spec:
21+
containers:
22+
- args:
23+
- --config-file=/conf/collector.yaml
24+
env:
25+
- name: SPAN_STORAGE_TYPE
26+
valueFrom:
27+
configMapKeyRef:
28+
key: span-storage-type
29+
name: jaeger-configuration
30+
image: jaegertracing/jaeger-collector:1.7.0
31+
name: jaeger-collector
32+
ports:
33+
- containerPort: 14267
34+
protocol: TCP
35+
- containerPort: 14268
36+
protocol: TCP
37+
- containerPort: 9411
38+
protocol: TCP
39+
readinessProbe:
40+
httpGet:
41+
path: /
42+
port: 14269
43+
volumeMounts:
44+
- mountPath: /conf
45+
name: jaeger-configuration-volume
46+
volumes:
47+
- configMap:
48+
items:
49+
- key: collector
50+
path: collector.yaml
51+
name: jaeger-configuration
52+
name: jaeger-configuration-volume

‎integration/init/jaeger-cassandra/expected/installer/base/Deployment-jaeger-query.yaml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
apiVersion: extensions/v1beta1
2+
kind: Deployment
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: query-deployment
7+
name: jaeger-query
8+
spec:
9+
replicas: 1
10+
strategy:
11+
type: Recreate
12+
template:
13+
metadata:
14+
annotations:
15+
prometheus.io/port: "16686"
16+
prometheus.io/scrape: "true"
17+
labels:
18+
app: jaeger
19+
jaeger-infra: query-pod
20+
spec:
21+
containers:
22+
- args:
23+
- --config-file=/conf/query.yaml
24+
env:
25+
- name: SPAN_STORAGE_TYPE
26+
valueFrom:
27+
configMapKeyRef:
28+
key: span-storage-type
29+
name: jaeger-configuration
30+
image: jaegertracing/jaeger-query:1.7.0
31+
name: jaeger-query
32+
ports:
33+
- containerPort: 16686
34+
protocol: TCP
35+
readinessProbe:
36+
httpGet:
37+
path: /
38+
port: 16687
39+
volumeMounts:
40+
- mountPath: /conf
41+
name: jaeger-configuration-volume
42+
volumes:
43+
- configMap:
44+
items:
45+
- key: query
46+
path: query.yaml
47+
name: jaeger-configuration
48+
name: jaeger-configuration-volume

‎integration/init/jaeger-cassandra/expected/installer/base/Job-jaeger-cassandra-schema-job.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
apiVersion: batch/v1
2+
kind: Job
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: cassandra-schema-job
7+
name: jaeger-cassandra-schema-job
8+
spec:
9+
activeDeadlineSeconds: 120
10+
template:
11+
metadata:
12+
name: cassandra-schema
13+
spec:
14+
containers:
15+
- env:
16+
- name: MODE
17+
value: prod
18+
- name: DATACENTER
19+
value: dc1
20+
image: jaegertracing/jaeger-cassandra-schema:1.6.0
21+
name: jaeger-cassandra-schema
22+
restartPolicy: OnFailure

‎integration/init/jaeger-cassandra/expected/installer/base/Service-cassandra.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: cassandra-service
7+
name: jaeger-cassandra-service
8+
name: cassandra
9+
spec:
10+
clusterIP: None
11+
ports:
12+
- name: intra-node
13+
port: 7000
14+
- name: tls-intra-node
15+
port: 7001
16+
- name: jmx
17+
port: 7199
18+
- name: cql
19+
port: 9042
20+
- name: thrift
21+
port: 9160
22+
selector:
23+
app: cassandra

‎integration/init/jaeger-cassandra/expected/installer/base/Service-jaeger-collector.yaml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: collector-service
7+
name: jaeger-collector
8+
spec:
9+
ports:
10+
- name: jaeger-collector-tchannel
11+
port: 14267
12+
protocol: TCP
13+
targetPort: 14267
14+
- name: jaeger-collector-http
15+
port: 14268
16+
protocol: TCP
17+
targetPort: 14268
18+
- name: jaeger-collector-zipkin
19+
port: 9411
20+
protocol: TCP
21+
targetPort: 9411
22+
selector:
23+
jaeger-infra: collector-pod
24+
type: ClusterIP

‎integration/init/jaeger-cassandra/expected/installer/base/Service-jaeger-query.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: query-service
7+
name: jaeger-query
8+
spec:
9+
ports:
10+
- name: jaeger-query
11+
port: 80
12+
protocol: TCP
13+
targetPort: 16686
14+
selector:
15+
jaeger-infra: query-pod
16+
type: LoadBalancer

‎integration/init/jaeger-cassandra/expected/installer/base/Service-zipkin.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: zipkin-service
7+
name: zipkin
8+
spec:
9+
ports:
10+
- name: jaeger-collector-zipkin
11+
port: 9411
12+
protocol: TCP
13+
targetPort: 9411
14+
selector:
15+
jaeger-infra: collector-pod
16+
type: ClusterIP

0 commit comments

Comments
 (0)