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

Commit 28429d3

Browse files
authored
Merge pull request #1038 from laverya/fix-bool-string-quoting
Fix bool string quoting with beta3 of laverya/yaml.v3
2 parents 7419b78 + 65dec2f commit 28429d3

File tree

20 files changed

+246
-23
lines changed

20 files changed

+246
-23
lines changed

Gopkg.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
assets:
2+
v1:
3+
- inline:
4+
contents: |
5+
apiVersion: apps/v1
6+
kind: Deployment
7+
metadata:
8+
name: redis
9+
labels:
10+
component: redis
11+
spec:
12+
replicas: 1
13+
selector:
14+
matchLabels:
15+
component: redis
16+
template:
17+
metadata:
18+
labels:
19+
component: redis
20+
spec:
21+
containers:
22+
- name: redis
23+
image: redis
24+
args: ["--appendonly", "yes"]
25+
dest: base/redis-deployment.yaml
26+
mode: 0644
27+
config:
28+
v1: []
29+
lifecycle:
30+
v1:
31+
- config:
32+
invalidates: ["render"]
33+
- render:
34+
requires: ["config"]
35+
root: "."
36+
- kustomize:
37+
requires: ["render"]
38+
base: ./base
39+
overlay: overlays/ship
40+
dest: rendered.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"v1": {
3+
"config": {},
4+
"releaseName": "nightly",
5+
"upstream": "__upstream__",
6+
"metadata": {
7+
"applicationType": "replicated.app",
8+
"sequence": 0,
9+
"releaseNotes": "",
10+
"version": "1.0.1",
11+
"licenseID": "__licenseID__",
12+
"appSlug": "bool-string-quoting",
13+
"license": {
14+
"id": "__licenseID__",
15+
"assignee": "bool string quoting integration test",
16+
"createdAt": "2019-07-23T17:45:22Z",
17+
"expiresAt": "0001-01-01T00:00:00Z",
18+
"type": "dev"
19+
}
20+
},
21+
"upstreamContents": {
22+
"appRelease": {
23+
"id": "SQiNQrWzKziDEPULQGJ-eGKakO4OT70p",
24+
"sequence": 1,
25+
"channelId": "3Z3r5ELqPj0755EddvxjWA8sR7C-Eqfw",
26+
"channelName": "Nightly",
27+
"channelIcon": "",
28+
"semver": "1.0.1",
29+
"releaseNotes": "",
30+
"spec": "assets:\n v1:\n - inline:\n contents: |\n apiVersion: apps/v1\n kind: Deployment\n metadata:\n name: redis\n labels:\n component: redis\n spec:\n replicas: 1\n selector:\n matchLabels:\n component: redis\n template:\n metadata:\n labels:\n component: redis\n spec:\n containers:\n - name: redis\n image: redis\n args: [\"--appendonly\", \"yes\"]\n dest: base/redis-deployment.yaml\n mode: 0644\nconfig:\n v1: []\nlifecycle:\n v1:\n - config:\n invalidates: [\"render\"]\n - render:\n requires: [\"config\"]\n root: \".\"\n - kustomize:\n requires: [\"render\"]\n base: ./base\n overlay: overlays/ship\n dest: rendered.yaml\n",
31+
"images": [],
32+
"githubContents": [],
33+
"created": "Tue Jul 23 2019 17:45:00 GMT+0000 (UTC)",
34+
"registrySecret": "3bfd99a69b5748fab756a593c7dcc852",
35+
"configSpec": "v1: []\n",
36+
"entitlements": {}
37+
}
38+
},
39+
"shipVersion": {
40+
"buildTime": "0001-01-01T00:00:00Z",
41+
"dependencies": {},
42+
"go": {
43+
"version": "go1.12.7",
44+
"compiler": "gc",
45+
"os": "darwin",
46+
"arch": "amd64"
47+
}
48+
},
49+
"contentSHA": "e84f92a45afefd50c548d664d0a6f32d474a84c416983b2a61d854f549ea6195"
50+
}
51+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
kind: ""
2+
apiversion: ""
3+
resources:
4+
- redis-deployment.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: redis
5+
labels:
6+
component: redis
7+
spec:
8+
replicas: 1
9+
selector:
10+
matchLabels:
11+
component: redis
12+
template:
13+
metadata:
14+
labels:
15+
component: redis
16+
spec:
17+
containers:
18+
- name: redis
19+
image: redis
20+
args: ["--appendonly", "yes"]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"op":"remove","path":"/metadata/labels/chart"}]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"op":"remove","path":"/metadata/labels/heritage"}]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
kind: ""
2+
apiversion: ""
3+
bases:
4+
- ../../base
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
kind: ""
2+
apiversion: ""
3+
bases:
4+
- ../defaults
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
labels:
5+
component: redis
6+
name: redis
7+
spec:
8+
replicas: 1
9+
selector:
10+
matchLabels:
11+
component: redis
12+
template:
13+
metadata:
14+
labels:
15+
component: redis
16+
spec:
17+
containers:
18+
- args:
19+
- --appendonly
20+
- "yes"
21+
image: redis
22+
name: redis
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
assets:
2+
v1:
3+
- inline:
4+
contents: |
5+
apiVersion: apps/v1
6+
kind: Deployment
7+
metadata:
8+
name: redis
9+
labels:
10+
component: redis
11+
spec:
12+
replicas: 1
13+
selector:
14+
matchLabels:
15+
component: redis
16+
template:
17+
metadata:
18+
labels:
19+
component: redis
20+
spec:
21+
containers:
22+
- name: redis
23+
image: redis
24+
args: ["--appendonly", "yes"]
25+
dest: base/redis-deployment.yaml
26+
mode: 0644
27+
config:
28+
v1: []
29+
lifecycle:
30+
v1:
31+
- config:
32+
invalidates: ["render"]
33+
- render:
34+
requires: ["config"]
35+
root: "."
36+
- kustomize:
37+
requires: ["render"]
38+
base: ./base
39+
overlay: overlays/ship
40+
dest: rendered.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
license_id: "Huof14jtSo4-4MbA9eLdC6_K3_vx-w0z"
2+
app_slug: "bool-string-quoting"
3+
release_version: "1.0.1"
4+
skip_cleanup: false

vendor/gopkg.in/laverya/yaml.v3/.travis.yml

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/laverya/yaml.v3/README.md

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/laverya/yaml.v3/decode.go

+5-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/laverya/yaml.v3/encode.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/laverya/yaml.v3/go.mod

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/laverya/yaml.v3/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/laverya/yaml.v3/resolve.go

+21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/laverya/yaml.v3/yaml.go

+9-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)