deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Fix configmap name case error (#1215)

Browse Source
This commit is contained in:
Hang Yan 2019-12-27 22:39:45 +08:00 committed by GitHub
parent d2d0d61cf2
commit bc32e29ee4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 3308 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -126,6 +126,9 @@ vendor-update:
find ./vendor/github.com/docker/distribution -type f -exec sed -i 's/Sirupsen/sirupsen/g' {} \;
rm -rf vendor/github.com/Sirupsen
# a field does not has json tag defined.
cp vendor-sync/types.go.txt vendor/k8s.io/kubernetes/pkg/api/types.go
.PHONY: test-k8s
test-k8s:

2
script/test/fixtures/compose-v3.3-test/output-k8s-config-long-warning.json vendored
View File

@ -70,7 +70,7 @@
"volumes": [
{
"configMap": {
"Name": "my-config",
"name": "my-config",
"defaultMode": 288
},
"name": "my-config"

2
script/test/fixtures/compose-v3.3-test/output-k8s-config-long.json vendored
View File

@ -70,7 +70,7 @@
"volumes": [
{
"configMap": {
"Name": "my-config",
"name": "my-config",
"defaultMode": 288
},
"name": "my-config"

12
script/test/fixtures/configmap/output-k8s-template.json vendored
View File

@ -78,8 +78,8 @@
"name": "ALLOW_EMPTY_PASSWORD",
"valueFrom": {
"configMapKeyRef": {
"Name": "foo-env",
"key": "ALLOW_EMPTY_PASSWORD"
"key": "ALLOW_EMPTY_PASSWORD",
"name": "foo-env"
}
}
},
@ -87,8 +87,8 @@
"name": "BAR",
"valueFrom": {
"configMapKeyRef": {
"Name": "bar-env",
"key": "BAR"
"key": "BAR",
"name": "bar-env"
}
}
},
@ -96,8 +96,8 @@
"name": "FOO",
"valueFrom": {
"configMapKeyRef": {
"Name": "bar-env",
"key": "FOO"
"key": "FOO",
"name": "bar-env"
}
}
}

8
script/test/fixtures/env/output-k8s.json vendored
View File

@ -79,7 +79,7 @@
"name": "BAR",
"valueFrom": {
"configMapKeyRef": {
"Name": "hadoop-hive-namenode-env",
"name": "hadoop-hive-namenode-env",
"key": "BAR"
}
}
@ -88,7 +88,7 @@
"name": "FOO",
"valueFrom": {
"configMapKeyRef": {
"Name": "hadoop-hive-namenode-env",
"name": "hadoop-hive-namenode-env",
"key": "FOO"
}
}
@ -166,7 +166,7 @@
"name": "BAR",
"valueFrom": {
"configMapKeyRef": {
"Name": "hadoop-hive-namenode-env",
"name": "hadoop-hive-namenode-env",
"key": "BAR"
}
}
@ -179,7 +179,7 @@
"name": "FOO",
"valueFrom": {
"configMapKeyRef": {
"Name": "hadoop-hive-namenode-env",
"name": "hadoop-hive-namenode-env",
"key": "FOO"
}
}

2
script/test/fixtures/image-pull-secret/provider-files/kubernetes-image-pull-secret.json vendored
View File

@ -99,7 +99,7 @@
],
"imagePullSecrets": [
{
"Name": "sample-k8s-secret-name"
"name": "sample-k8s-secret-name"
}
],
"restartPolicy": "Always",

4
script/test/fixtures/merge-multiple-compose/output-other-toplevel-merge-template.json vendored
View File

@ -76,7 +76,7 @@
"volumes": [
{
"configMap": {
"Name": "firstconfig",
"name": "firstconfig",
"defaultMode": 644
},
"name": "firstconfig"
@ -188,7 +188,7 @@
"volumes": [
{
"configMap": {
"Name": "secondconfig",
"name": "secondconfig",
"defaultMode": 644
},
"name": "secondconfig"

2
script/test/fixtures/merge-multiple-compose/output-other-toplevel-override-template.json vendored
View File

@ -76,7 +76,7 @@
"volumes": [
{
"configMap": {
"Name": "firstconfig",
"name": "firstconfig",
"defaultMode": 644
},
"name": "firstconfig"

3288
script/vendor-sync/types.go.txt Normal file
View File

File diff suppressed because it is too large Load Diff

2
vendor/k8s.io/kubernetes/pkg/api/types.go generated vendored
View File

@ -2583,7 +2583,7 @@ type ObjectReference struct {
// LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace.
type LocalObjectReference struct {
//TODO: Add other useful fields. apiVersion, kind, uid?
Name string
Name string `json:"name"`
}
type SerializedReference struct {