configgin 0.20.1 → 0.20.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63612fca928e0ea9680d2aa934bba36d415b181b1a50aa6d658a6106d4d19594
-  data.tar.gz: a43f3edbf53a5873bebab509a63e4ec4d3205f64acce45a6a74e6123aa1e6b7e
+  metadata.gz: 4c7414ca5ae185e043c4b5e085cd3d32bbd45e18f69faf400a35c30902ac56b8
+  data.tar.gz: 663a9ce843fea21f5395ab635c5636808905e12174a07260d488cdb0d489dfe0
 SHA512:
-  metadata.gz: ed1530692c0fe508e0c44a85e1a3b79cf47d31ca48333702916205cee433849292682ae27b0344bec189fd8dc99ff802b54644de3e9af165661d621a7691a418
-  data.tar.gz: 74ecda31ff9283ae672631db17ae1c61a4b0fd24e65c1e4521b875835702ddcd5949c7ed2d6555f50776d29aa51f3eb20ca1458e5f89c78201caa82fbb1045ee
+  metadata.gz: 18be60efb06a4b567b03a2d6ff1561495629e27cdc99f9417521146ac1a544d9b1be23a09cd077a544958b639a578e3d8e6787734cb856a1333c86e4b83647c3
+  data.tar.gz: 96099aab13ec542bb195dc4ca6f63cc4fc374a68fe05f6101c85b134e2e7f2cc7efbf5e67ba8e83e856071ae0316e82511f05eebd922b698841c4301b43932ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    configgin (0.20.1)
+    configgin (0.20.1.1)
       bosh-template (~> 2.0)
       deep_merge (~> 1.1)
       kubeclient (~> 4.3)

data/lib/configgin.rb

@@ -71,7 +71,8 @@ class Configgin
   def export_job_properties(jobs)
     # Co-located containers don't get to export properties.
     return unless instance_group == ENV["KUBERNETES_CONTAINER_NAME"]
-    # Jobs (errands) don't export properties.
+    # Jobs (errands) and unowned pods (tests) don't export properties.
+    return unless self_pod['metadata']['ownerReferences']
     return unless self_pod['metadata']['ownerReferences'][0]['kind'] == "StatefulSet"
 
     sts = kube_client_stateful_set.get_stateful_set(instance_group, kube_namespace)
@@ -101,12 +102,12 @@ class Configgin
 
     # version tag changes whenever the chart version or the secrets generation changes
     version_tag = ENV["CONFIGGIN_VERSION_TAG"]
-    new_tag = !secret.data.to_h.key?(version_tag.to_sym)
+    new_tag = !secret.data[version_tag]
     secret.data = {version_tag => ""} if new_tag # make sure old properties are deleted during upgrade
 
     digests = {}
     jobs.each do |name, job|
-      secret.data["skiff-exported-properties-#{name}"] = Base64.encode64(job.exported_properties.to_json)
+      secret.data["skiff-exported-properties-#{name}"] = Base64.strict_encode64(job.exported_properties.to_json)
       digests[name] = property_digest(job.exported_properties)
 
       # Record initial digest values whenever the tag changes, in which case the pod startup
@@ -114,9 +115,10 @@ class Configgin
       # tags in the corresponding secrets. There is no annotation when importing this set of
       # initial values because the helm chart doesn't include any annotations, and we don't
       # want to trigger a pod restart by adding them.
-      encoded_digest = Base64.encode64(digests[name])
+      encoded_digest = Base64.strict_encode64(digests[name])
       if new_tag
         secret.data["skiff-initial-digest-#{name}"] = encoded_digest
+        secret.data["skiff-initial-properties-#{name}"] = secret.data["skiff-exported-properties-#{name}"]
       end
       if secret.data["skiff-initial-digest-#{name}"] == encoded_digest
         digests[name] = nil
@@ -124,6 +126,11 @@ class Configgin
     end
     kube_client.update_secret(secret)
 
+    warn "new_tag=#{new_tag}"
+    secret.data.to_h.each_pair do |key, value|
+      warn "secret.data[#{key}]=#{value}"
+    end
+
     # Some pods might depend on the properties exported by this pod; add annotations
     # to the template spec of the stateful sets so that the pods will be restarted if
     # the exported values have changed from the initial values.
@@ -154,9 +161,11 @@ class Configgin
       # only restarts pods when the checksum of the pod spec changes, so no-op "updates" are ok.
       annotations = {}
       sts.spec.template.metadata.annotations.each_pair do |key, value|
+        warn "Copying old annotation #{key}=#{value}"
         annotations[key] = value
       end
       digests.each_pair do |key, value|
+        warn "Setting new annotation #{key}=#{value}"
         annotations[key] = value
       end
 

data/lib/configgin/version.rb

@@ -1,3 +1,3 @@
 class Configgin
-  VERSION = '0.20.1'.freeze
+  VERSION = '0.20.1.1'.freeze
 end

data/lib/kube_link_generator.rb

@@ -81,7 +81,7 @@ class KubeLinkSpecs
     # tag in the corresponding secret.
     secret = client.get_secret(role_name, namespace)
     begin
-      JSON.parse(Base64.decode64(secret.data["skiff-exported-properties-#{job_name}"]))
+      JSON.parse(Base64.strict_decode64(secret.data["skiff-exported-properties-#{job_name}"]))
     rescue
       puts "Role #{role_name} is missing skiff-exported-properties-#{job_name}"
       fail

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configgin
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.1.1
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler