Skip to content

Commit 4697b78

Browse files
committed
internal/third_party/yaml: improve yaml positining
- retain more of the original spacing into the conversion - store original absolute positions Change-Id: Id1edbefe1050e1f2dcec3ceb2f8877018b0b5876 Reviewed-on: https://cue-review.googlesource.com/c/cue/+/2562 Reviewed-by: Marcel van Lohuizen <[email protected]>
1 parent 99e7b6d commit 4697b78

File tree

33 files changed

+343
-157
lines changed

33 files changed

+343
-157
lines changed

doc/tutorial/kubernetes/quick/services/frontend/bartender/kube.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ package kube
22

33
deployment bartender spec template spec containers: [{
44
image: "gcr.io/myproj/bartender:v0.1.34"
5-
args: []
5+
args: [
6+
]
67
}]

doc/tutorial/kubernetes/quick/services/frontend/breaddispatcher/kube.cue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ package kube
22

33
deployment breaddispatcher spec template spec containers: [{
44
image: "gcr.io/myproj/breaddispatcher:v0.3.24"
5-
args: ["-etcd=etcd:2379", "-event-server=events:7788"]
5+
args: [
6+
"-etcd=etcd:2379",
7+
"-event-server=events:7788",
8+
]
69
}]

doc/tutorial/kubernetes/quick/services/frontend/host/kube.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ deployment host spec: {
44
replicas: 2
55
template spec containers: [{
66
image: "gcr.io/myproj/host:v0.1.10"
7-
args: []
7+
args: [
8+
]
89
}]
910
}

doc/tutorial/kubernetes/quick/services/frontend/maitred/kube.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ package kube
22

33
deployment maitred spec template spec containers: [{
44
image: "gcr.io/myproj/maitred:v0.0.4"
5-
args: []
5+
args: [
6+
]
67
}]

doc/tutorial/kubernetes/quick/services/frontend/valeter/kube.cue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ deployment valeter spec template spec containers: [{
88
ports: [{
99
containerPort: 8080
1010
}]
11-
args: ["-http=:8080", "-etcd=etcd:2379"]
11+
args: [
12+
"-http=:8080",
13+
"-etcd=etcd:2379",
14+
]
1215
}]

doc/tutorial/kubernetes/quick/services/frontend/waterdispatcher/kube.cue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@ service waterdispatcher spec ports: [{
55
}]
66
deployment waterdispatcher spec template spec containers: [{
77
image: "gcr.io/myproj/waterdispatcher:v0.0.48"
8-
args: ["-http=:8080", "-etcd=etcd:2379"]
8+
args: [
9+
"-http=:8080",
10+
"-etcd=etcd:2379",
11+
]
912
}]

doc/tutorial/kubernetes/quick/services/infra/download/kube.cue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ package kube
22

33
deployment download spec template spec containers: [{
44
image: "gcr.io/myproj/download:v0.0.2"
5-
ports: [{
6-
containerPort: 7080
7-
}]
5+
ports: [{containerPort: 7080}]
86
}]

doc/tutorial/kubernetes/quick/services/infra/etcd/kube.cue

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ statefulSet etcd spec: {
2020
labelSelector matchExpressions: [{
2121
key: "app"
2222
operator: "In"
23-
values: ["etcd"]
23+
values: [
24+
"etcd",
25+
]
2426
}]
2527
topologyKey: "kubernetes.io/hostname"
2628
}]
@@ -59,12 +61,28 @@ statefulSet etcd spec: {
5961
valueFrom fieldRef fieldPath: "status.podIP"
6062
}]
6163
command: ["/usr/local/bin/etcd"]
62-
args: ["-name", "$(NAME)", "-data-dir", "/data/etcd3", "-initial-advertise-peer-urls", "http://$(IP):2380", "-listen-peer-urls", "http://$(IP):2380", "-listen-client-urls", "http://$(IP):2379,http://127.0.0.1:2379", "-advertise-client-urls", "http://$(IP):2379", "-discovery", "https://discovery.etcd.io/xxxxxx"]
64+
args: [
65+
"-name",
66+
"$(NAME)",
67+
"-data-dir",
68+
"/data/etcd3",
69+
"-initial-advertise-peer-urls",
70+
"http://$(IP):2380",
71+
"-listen-peer-urls",
72+
"http://$(IP):2380",
73+
"-listen-client-urls",
74+
"http://$(IP):2379,http://127.0.0.1:2379",
75+
"-advertise-client-urls",
76+
"http://$(IP):2379",
77+
"-discovery",
78+
"https://discovery.etcd.io/xxxxxx",
79+
]
6380
}]
6481
}
6582
}
6683
// bootstrap
6784
// "-initial-cluster-token", "etcd-prod-events2",
85+
6886
volumeClaimTemplates: [{
6987
metadata: {
7088
name: "etcd3"

doc/tutorial/kubernetes/quick/services/infra/events/kube.cue

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ deployment events spec: {
1515
labelSelector matchExpressions: [{
1616
key: "app"
1717
operator: "In"
18-
values: ["events"]
18+
values: [
19+
"events",
20+
]
1921
}]
2022
topologyKey: "kubernetes.io/hostname"
2123
}]
@@ -30,7 +32,12 @@ deployment events spec: {
3032
}, {
3133
containerPort: 7788
3234
}]
33-
args: ["-cert=/etc/ssl/server.pem", "-key=/etc/ssl/server.key", "-grpc=:7788"]
35+
args: [
36+
"-cert=/etc/ssl/server.pem",
37+
"-key=/etc/ssl/server.key",
38+
"-grpc=:7788",
39+
]
40+
3441
volumeMounts: [{
3542
mountPath: "/etc/ssl"
3643
name: "secret-volume"

doc/tutorial/kubernetes/quick/services/infra/tasks/service.cue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package kube
22

33
service tasks spec: {
44
type: "LoadBalancer"
5-
loadBalancerIP: "1.2.3.4"
6-
// static ip
5+
loadBalancerIP: "1.2.3.4" // static ip
76
ports: [{
87
port: 443
98
name: "http"

0 commit comments

Comments
 (0)