configgin 0.18.3 → 0.18.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f039a554edb196b8da7fdf70d1f73bc6d1d89871
4
- data.tar.gz: b406c33a66f12103b851f224271cd50050cd8048
3
+ metadata.gz: 6fc09ccb349dbfe9d897aba65564973ed6efc1da
4
+ data.tar.gz: 173d309aa8fa267b705ee87d7843ba2b43483fb1
5
5
  SHA512:
6
- metadata.gz: efa9d5b7eec55d4e27fa363a252a7ea0a102301850103af25b757da4dc363f6c4088fcbc0d01153943acd84873d9858b5bb44d02f8a69ba7713ee18cafd8e627
7
- data.tar.gz: 6c9f6850b8b6206318e01b4a34421a77653e7a3d617f7308490eceea34423bdd3c89ee603df0e61de3240f9893271616764b2ad69603d00111439b8ea4947a06
6
+ metadata.gz: 7795d12409c699470b202e97c3f3e829bf7bf7001a57ec00f03aa18e32027a4dc922b4fa44bc24fce99ba306cfc47aa9dde10a206d820af21da26d1a1e12a09c
7
+ data.tar.gz: 57d88d76d052d4b279bf714cc3b63decff84c83e1227b3a454995fce41f9e2ca6b1ebfc966299a30fc7284539f42c00a1dd1ae9c3d87bbd365c905b3df8217c4
@@ -7,7 +7,7 @@ class BoshDeploymentManifest
7
7
  end
8
8
 
9
9
  def properties_for_instance_group(instance_group_name)
10
- return @properties[instance_group] if @properties && @properties[instance_group]
10
+ return @properties[instance_group_name] if @properties && @properties[instance_group_name]
11
11
 
12
12
  instance_group = @manifest['instance_groups'].find { |group| group['name'] == instance_group_name }
13
13
  return [] unless instance_group
@@ -22,7 +22,7 @@ class BoshDeploymentManifest
22
22
  end
23
23
 
24
24
  @properties ||= {}
25
- @properties[instance_group] = properties
25
+ @properties[instance_group_name] = properties
26
26
  end
27
27
 
28
28
  private
@@ -1,3 +1,3 @@
1
1
  class Configgin
2
- VERSION = '0.18.3'.freeze
2
+ VERSION = '0.18.4'.freeze
3
3
  end
@@ -172,9 +172,10 @@ class KubeLinkSpecs
172
172
 
173
173
  # Underscores aren't valid hostnames, so jobs are transformed in fissile to use dashes
174
174
  job_name = provider['job'].gsub('_', '-')
175
+ service_name = provider['service_name'] || "#{provider['role']}-#{job_name}"
175
176
 
176
177
  @links[key] = {
177
- 'address' => "#{provider['role']}-#{job_name}.#{ENV['KUBERNETES_NAMESPACE']}.svc.#{ENV['KUBERNETES_CLUSTER_DOMAIN']}",
178
+ 'address' => "#{service_name}.#{ENV['KUBERNETES_NAMESPACE']}.svc.#{ENV['KUBERNETES_CLUSTER_DOMAIN']}",
178
179
  'instance_group' => '', # This is probably the role name from the manifest
179
180
  'default_network' => '',
180
181
  'deployment_name' => namespace,
@@ -11,9 +11,10 @@
11
11
 
12
12
  set -o errexit -o nounset
13
13
 
14
- REPO="${REPO:-scf}"
14
+ REPO="${REPO:-../../github.com/SUSE/scf}"
15
15
 
16
- IMAGE="$( cd "../${REPO}" && source .envrc && echo "${FISSILE_STEMCELL}" )"
16
+ REPO="$( cd "${REPO}" && echo "${PWD}" )"
17
+ IMAGE="$( cd "${REPO}" && source .envrc && echo "${FISSILE_STEMCELL}" )"
17
18
 
18
19
  name="${IMAGE%%:*}"
19
20
  tag="${IMAGE##*:}"
@@ -39,7 +40,7 @@ kubectl config use-context vagrant
39
40
 
40
41
  vagrant_ready=""
41
42
  if test -z "${NO_RUN:-}" ; then
42
- if ( cd "$(dirname "$0")/../${REPO}" && (vagrant status 2>/dev/null | grep --quiet running) ) ; then
43
+ if ( cd "${REPO}" && (vagrant status 2>/dev/null | grep --quiet running) ) ; then
43
44
  vagrant_ready="true"
44
45
  releases=$(helm list --short)
45
46
  if test -n "${releases}" ; then
@@ -84,7 +85,7 @@ docker push "${docker_user}/${name##*/}:${tag}"
84
85
 
85
86
  test -n "${vagrant_ready}" || exit
86
87
 
87
- cd "$(dirname "$0")/../${REPO}"
88
+ cd "${REPO}"
88
89
 
89
90
  vagrant ssh -- -tt <<EOF
90
91
  set -o errexit -o nounset
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: configgin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.18.3
4
+ version: 0.18.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - SUSE
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-11-02 00:00:00.000000000 Z
11
+ date: 2018-11-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler