Unverified Commit fc1db176 authored by bryanl's avatar bryanl
Browse files

ksonnet lib printer fixes


Signed-off-by: default avatarbryanl <bryanliles@gmail.com>
parent ba676442
......@@ -427,8 +427,8 @@
"ksonnet-gen/nodemaker",
"ksonnet-gen/printer"
]
revision = "dda11dd2ec3928cbb7f36830ec0d8aa5fb13ce0c"
version = "v0.1.5"
revision = "863b9da5f131177b6bf7c0678a8d5ff909956b0e"
version = "v0.1.7"
[[projects]]
name = "github.com/magiconair/properties"
......@@ -1267,6 +1267,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "d54e717c9705768768030c1d16e15347c44b0b4edb40dc2a1d7caafd34f50311"
inputs-digest = "88a763c70a9571fdacc12685c647c669f746dde769ed278b9f3acbe490063ce9"
solver-name = "gps-cdcl"
solver-version = 1
......@@ -52,7 +52,7 @@ required = ["k8s.io/kubernetes/pkg/kubectl/cmd/util"]
[[constraint]]
name = "github.com/ksonnet/ksonnet-lib"
version = "v0.1.5"
version = "v0.1.7"
[[constraint]]
name = "github.com/onsi/ginkgo"
......
......@@ -3,7 +3,7 @@ local params = {};
params + {
components+: {
foo+: {
replicas: 1
}
}
replicas: 1,
},
},
}
\ No newline at end of file
......@@ -3,7 +3,7 @@ local params = {};
params {
components+: {
foo+: {
replicas: 1
}
}
replicas: 1,
},
},
}
\ No newline at end of file
// Copyright 2018 The ksonnet authors
//
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package app
import (
......
// Copyright 2018 The ksonnet authors
//
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package app
import (
......
local params = import "../../components/params.libsonnet";
local params = import '../../components/params.libsonnet';
params {
components+: {}
components+: {},
}
\ No newline at end of file
......@@ -5,13 +5,13 @@
// Each object below should correspond to a component in the components/ directory
"guestbook-ui": {
containerPort: 80,
image: "gcr.io/heptio-images/ks-guestbook-demo:0.1",
name: "guiroot",
image: 'gcr.io/heptio-images/ks-guestbook-demo:0.1',
name: 'guiroot',
obj: {
a: "b"
a: 'b',
},
servicePort: 80,
type: "ClusterIP"
}
}
type: 'ClusterIP',
},
},
}
\ No newline at end of file
......@@ -5,14 +5,14 @@
// Each object below should correspond to a component in the components/ directory
"guestbook-ui": {
containerPort: 80,
image: "gcr.io/heptio-images/ks-guestbook-demo:0.1",
name: "guiroot",
image: 'gcr.io/heptio-images/ks-guestbook-demo:0.1',
name: 'guiroot',
obj: {
a: "b"
a: 'b',
},
replicas: 4,
servicePort: 80,
type: "ClusterIP"
}
}
type: 'ClusterIP',
},
},
}
\ No newline at end of file
......@@ -4,7 +4,7 @@
// Component-level parameters, defined initially from 'ks prototype use ...'
// Each object below should correspond to a component in the components/ directory
"certificate-crd": {
spec: {}
}
}
spec: {},
},
},
}
\ No newline at end of file
......@@ -5,9 +5,9 @@
other: 1,
metadata: {
labels: {
locala: "local"
}
}
}
}
locala: 'local',
},
},
},
},
}
\ No newline at end of file
......@@ -3,8 +3,8 @@
components: {
"certificate-crd": {
spec: {
version: "v2"
}
}
}
version: 'v2',
},
},
},
}
\ No newline at end of file
{
foo: "bar"
foo: 'bar',
}
\ No newline at end of file
local params = import "../../components/params.libsonnet";
local params = import '../../components/params.libsonnet';
params + {
components+: {
component1+: {}
}
component1+: {},
},
}
\ No newline at end of file
local params = import "../../components/params.libsonnet";
local params = import '../../components/params.libsonnet';
params + {
components +: {
component1 +: {
foo: "bar",
foo: 'bar',
},
},
}
local params = import "../../components/params.libsonnet";
local params = import '../../components/params.libsonnet';
params + {
components+: {
component1+: {
foo: "bar"
}
}
foo: 'bar',
},
},
}
\ No newline at end of file
local params = std.extVar("__ksonnet/params");
local globals = import "globals.libsonnet";
local params = std.extVar('__ksonnet/params');
local globals = import 'globals.libsonnet';
local envParams = params + {
components+: {}
components+: {},
};
{
components: {
[x]: envParams.components[x] + globals for x in std.objectFields(envParams.components)
}
[x]: envParams.components[x] + globals
for x in std.objectFields(envParams.components)
},
}
\ No newline at end of file
{group: "dev"}
\ No newline at end of file
{ group: 'dev' }
\ No newline at end of file
local params = std.extVar("__ksonnet/params");
local globals = import "globals.libsonnet";
local params = std.extVar('__ksonnet/params');
local globals = import 'globals.libsonnet';
local envParams = params + {
components+: {
guestbook+: {
name: "guestbook-dev",
replicas: params.global.replicas
name: 'guestbook-dev',
replicas: params.global.replicas,
},
component+: {
name: "new-component"
}
}
name: 'new-component',
},
},
};
{
components: {
[x]: envParams.components[x] + globals for x in std.objectFields(envParams.components)
}
[x]: envParams.components[x] + globals
for x in std.objectFields(envParams.components)
},
}
\ No newline at end of file
local params = std.extVar("__ksonnet/params");
local globals = import "globals.libsonnet";
local params = std.extVar('__ksonnet/params');
local globals = import 'globals.libsonnet';
local envParams = params + {
components+: {
guestbook+: {
name: "guestbook-dev",
name: 'guestbook-dev',
replicas: params.global.replicas,
containerPort: 8080
}
}
containerPort: 8080,
},
},
};
{
components: {
[x]: envParams.components[x] + globals for x in std.objectFields(envParams.components)
}
[x]: envParams.components[x] + globals
for x in std.objectFields(envParams.components)
},
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment