Skip to content

Commit

Permalink
Render YAML with yaml.v3
Browse files Browse the repository at this point in the history
- yaml.v3 author refuses to support special indentation for sequences;
  adjust tests containing arrays to indent.
  (see also: go-yaml/yaml#661)
  • Loading branch information
jtigger committed Apr 8, 2022
1 parent 4cd855c commit b24f1e0
Show file tree
Hide file tree
Showing 64 changed files with 725 additions and 636 deletions.
16 changes: 8 additions & 8 deletions examples/concourse-overlay/expected.txt
@@ -1,10 +1,10 @@
resources:
- name: booklit
type: git
source:
uri: https://github.com/vito/booklit
- name: booklit
type: git
source:
uri: https://github.com/vito/booklit
jobs:
- name: unit
plan:
- get: booklit
trigger: true
- name: unit
plan:
- get: booklit
trigger: true
8 changes: 4 additions & 4 deletions examples/data-values-multiple-envs/expected.txt
@@ -1,19 +1,19 @@
app_config:
version: "123"
ports:
- 8080
- 8080
***
app_config:
version: v1alpha1
ports:
- 8080
- 8080
***
app_config:
version: v1beta1
ports:
- 8081
- 8081
***
app_config:
version: v1
ports:
- 80
- 80
2 changes: 1 addition & 1 deletion examples/data-values-required/expected.txt
@@ -1,4 +1,4 @@
app_config:
version: "123"
ports:
- 8080
- 8080
38 changes: 19 additions & 19 deletions examples/eirini/config-result.yml
Expand Up @@ -11,8 +11,8 @@ metadata:
app.kubernetes.io/version: chart-appver
helm.sh/chart: chart-name-chart-ver
subjects:
- kind: ServiceAccount
name: secret-generator
- kind: ServiceAccount
name: secret-generator
roleRef:
kind: Role
name: configgin-role
Expand All @@ -31,8 +31,8 @@ metadata:
app.kubernetes.io/version: chart-appver
helm.sh/chart: chart-name-chart-ver
subjects:
- kind: ServiceAccount
name: secret-generator
- kind: ServiceAccount
name: secret-generator
roleRef:
kind: Role
name: secrets-role
Expand All @@ -51,9 +51,9 @@ metadata:
app.kubernetes.io/version: chart-appver
helm.sh/chart: chart-name-chart-ver
subjects:
- kind: ServiceAccount
name: secret-generator
namespace: release-ns
- kind: ServiceAccount
name: secret-generator
namespace: release-ns
roleRef:
kind: ClusterRole
name: release-ns-psp-role-nonprivileged
Expand All @@ -72,15 +72,15 @@ metadata:
app.kubernetes.io/version: chart-appver
helm.sh/chart: chart-name-chart-ver
rules:
- apiGroups:
- ""
resources:
- configmaps
- secrets
verbs:
- create
- get
- list
- patch
- update
- delete
- apiGroups:
- ""
resources:
- configmaps
- secrets
verbs:
- create
- get
- list
- patch
- update
- delete
6 changes: 3 additions & 3 deletions examples/k8s-config-map-files/expected.txt
Expand Up @@ -11,9 +11,9 @@ data:
config2.yml: |
rules2a: 123
rules2b:
- a
- b
- c
- a
- b
- c
config2.json: '{"rules2a":123,"rules2b":["a","b","c"]}'
config3.yml: |
config3a: config3a
Expand Down
92 changes: 46 additions & 46 deletions examples/k8s-overlay-all-containers/expected.txt
Expand Up @@ -6,34 +6,34 @@ spec:
template:
spec:
volumes:
- name: shared-data
emptyDir: {}
containers:
- name: nginx-container
image: nginx
volumeMounts:
- name: shared-data
mountPath: /usr/share/nginx/html
resources:
limits:
cpu: 100m
requests:
cpu: 100m
- name: debian-container
image: debian
volumeMounts:
- name: shared-data
mountPath: /pod-data
command:
- /bin/sh
args:
- -c
- echo Hello > /pod-data/index.html
resources:
limits:
cpu: 100m
requests:
cpu: 100m
emptyDir: {}
containers:
- name: nginx-container
image: nginx
volumeMounts:
- name: shared-data
mountPath: /usr/share/nginx/html
resources:
limits:
cpu: 100m
requests:
cpu: 100m
- name: debian-container
image: debian
volumeMounts:
- name: shared-data
mountPath: /pod-data
command:
- /bin/sh
args:
- -c
- echo Hello > /pod-data/index.html
resources:
limits:
cpu: 100m
requests:
cpu: 100m
---
apiVersion: apps/v1
kind: Deployment
Expand All @@ -43,22 +43,22 @@ spec:
template:
spec:
containers:
- name: nginx-container
image: nginx
resources:
limits:
cpu: 100m
requests:
cpu: 100m
- name: debian-container
image: debian
command:
- /bin/sh
args:
- -c
- echo Hello
resources:
limits:
cpu: 100m
requests:
cpu: 100m
- name: nginx-container
image: nginx
resources:
limits:
cpu: 100m
requests:
cpu: 100m
- name: debian-container
image: debian
command:
- /bin/sh
args:
- -c
- echo Hello
resources:
limits:
cpu: 100m
requests:
cpu: 100m
62 changes: 31 additions & 31 deletions examples/k8s-overlay-remove-resources/expected.txt
Expand Up @@ -16,10 +16,10 @@ spec:
sidecar.istio.io/proxyMemory: 0M
spec:
containers:
- name: nginx
image: nginx:1.14.2
ports:
- containerPort: 80
- name: nginx
image: nginx:1.14.2
ports:
- containerPort: 80
---
apiVersion: apps/v1
kind: Deployment
Expand All @@ -39,17 +39,17 @@ spec:
sidecar.istio.io/proxyMemory: 0M
spec:
initContainers:
- name: setup
image: ubuntu
command:
- /bin/bash
- -c
- echo 1
- name: setup
image: ubuntu
command:
- /bin/bash
- -c
- echo 1
containers:
- name: nginx
image: nginx:1.14.2
ports:
- containerPort: 80
- name: nginx
image: nginx:1.14.2
ports:
- containerPort: 80
---
apiVersion: apps/v1
kind: StatefulSet
Expand All @@ -70,21 +70,21 @@ spec:
spec:
terminationGracePeriodSeconds: 10
containers:
- name: nginx
image: k8s.gcr.io/nginx-slim:0.8
ports:
- containerPort: 80
name: web
volumeMounts:
- name: www
mountPath: /usr/share/nginx/html
- name: nginx
image: k8s.gcr.io/nginx-slim:0.8
ports:
- containerPort: 80
name: web
volumeMounts:
- name: www
mountPath: /usr/share/nginx/html
volumeClaimTemplates:
- metadata:
name: www
spec:
accessModes:
- ReadWriteOnce
storageClassName: my-storage-class
resources:
requests:
storage: 1Gi
- metadata:
name: www
spec:
accessModes:
- ReadWriteOnce
storageClassName: my-storage-class
resources:
requests:
storage: 1Gi
8 changes: 4 additions & 4 deletions examples/k8s-relative-rolling-update/expected.txt
Expand Up @@ -18,7 +18,7 @@ spec:
app: nginx
spec:
containers:
- name: nginx
image: nginx:1.7.9
ports:
- containerPort: 80
- name: nginx
image: nginx:1.7.9
ports:
- containerPort: 80
16 changes: 8 additions & 8 deletions examples/k8s-update-env-var/expected.txt
Expand Up @@ -6,11 +6,11 @@ spec:
template:
spec:
containers:
- name: app
env:
- name: STRIMZI_RESOURCE_LABELS
value: strimzi.io/cluster=my-cluster
- name: STRIMZI_KAFKA_BOOTSTRAP_SERVERS
value: NEW-my-cluster-kafka-bootstrap:9092
- name: STRIMZI_ZOOKEEPER_CONNECT
value: my-cluster-zookeeper-client:2181
- name: app
env:
- name: STRIMZI_RESOURCE_LABELS
value: strimzi.io/cluster=my-cluster
- name: STRIMZI_KAFKA_BOOTSTRAP_SERVERS
value: NEW-my-cluster-kafka-bootstrap:9092
- name: STRIMZI_ZOOKEEPER_CONNECT
value: my-cluster-zookeeper-client:2181
42 changes: 21 additions & 21 deletions examples/schema-arrays/expected.txt
@@ -1,22 +1,22 @@
resources:
- name: cf-for-k8s-develop
source:
private_key: ((cf_for_k8s_readwrite_deploy_key.private_key))
branch: develop
uri: git@github.com:cloudfoundry/cf-for-k8s
type: git
icon: github
- name: cf-for-k8s-ci
type: git
icon: github
source:
branch: develop
uri: git@github.com:cloudfoundry/cf-for-k8s
private_key: ((cf_for_k8s_readonly_deploy_key.private_key))
- name: cf-acceptance-tests
source:
uri: git@github.com:cloudfoundry/cf-acceptance-tests
branch: develop
private_key: ((cf_for_k8s_readonly_deploy_key.private_key))
type: git
icon: github
- name: cf-for-k8s-develop
source:
private_key: ((cf_for_k8s_readwrite_deploy_key.private_key))
branch: develop
uri: git@github.com:cloudfoundry/cf-for-k8s
type: git
icon: github
- name: cf-for-k8s-ci
type: git
icon: github
source:
branch: develop
uri: git@github.com:cloudfoundry/cf-for-k8s
private_key: ((cf_for_k8s_readonly_deploy_key.private_key))
- name: cf-acceptance-tests
source:
uri: git@github.com:cloudfoundry/cf-acceptance-tests
branch: develop
private_key: ((cf_for_k8s_readonly_deploy_key.private_key))
type: git
icon: github

0 comments on commit b24f1e0

Please sign in to comment.