configgin 0.19.6 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d5a7939e1688f2736e064e5934774426b532431c4c04d96efd35d56ecc226ff
-  data.tar.gz: 39796b6aaac3881c229140934a850c796ea14806b1a6f6b5e2e7669221f8d89e
+  metadata.gz: 76195539d5fcf090c3e5aefb6b44b33a65368b2f0269ec23aad686208aa5f1e0
+  data.tar.gz: 40938f7e9998ea730694ca03517daf3ad7e052c6899317afa5fdbf325b52dd7a
 SHA512:
-  metadata.gz: d9f0fa9861e5d214e53e4808c0ce6ec7c6e7c9a16c8d2f49fa2287ae364e055336119f7afc7cc545dc4ec1d07b1da751c7ae28b49dd028d2faaf95a1815e50b6
-  data.tar.gz: c63722bc02704f2eed7d980c064b6536819c4064597cae386f45824302d1b57e0376f5f4847f34f480e874238665e0978ff78d4200c827571509c7f8d608372d
+  metadata.gz: f5007925f8d5690e4b18295d9fbf33bb798d3c50a77227a6157542f79ebcf9463a32c52a84dd279061c2a8de3df4a3c70b6d5a12a7e309005f8e8d52a7faedc3
+  data.tar.gz: 726e3d78b75c447e222a4c36fb12e3cb9937a4be31a03341246154c58d5d4edb9224f8a1c07017da959381219341834da4ae2081f56fe772951a8b240fed5b1e

data/Gemfile.lock

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

data/lib/configgin.rb

@@ -67,17 +67,16 @@ class Configgin
     end
   end
 
-  # Write exported properties to secret and potentially restart affected pods.
+  # Write exported properties to secret and update annotations on importing stateful sets.
   def export_job_properties(jobs)
-    # co-located containers don't get to export properties
+    # Co-located containers don't get to export properties.
     return unless instance_group == ENV["KUBERNETES_CONTAINER_NAME"]
-    # jobs don't export properties
+    # Jobs (errands) don't export properties.
     return unless self_pod['metadata']['ownerReferences'][0]['kind'] == "StatefulSet"
 
     sts = kube_client_stateful_set.get_stateful_set(instance_group, kube_namespace)
 
     # Make sure the secret attached to the stateful set exists.
-    # XXX This should probably be done by fissile via the helm chart.
     secret = Kubeclient::Resource.new
     secret.metadata = {
       name: sts.metadata.name,
@@ -100,22 +99,22 @@ class Configgin
     secret = kube_client.get_secret(instance_group, kube_namespace)
     secret.data ||= {}
 
+    # version tag changes whenever the chart version or the secrets generation changes
     version_tag = ENV["CONFIGGIN_VERSION_TAG"]
     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|
-      digests[name] = property_digest(job.exported_properties)
       secret.data["skiff-exported-properties-#{name}"] = Base64.encode64(job.exported_properties.to_json)
-
-      encoded_digest = Base64.encode64(digests[name])
+      digests[name] = property_digest(job.exported_properties)
 
       # Record initial digest values whenever the tag changes, in which case the pod startup
       # order is already controlled by the "CONFIGGIN_IMPORT_#{role}" references to the new
       # 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])
       if new_tag
         secret.data["skiff-initial-digest-#{name}"] = encoded_digest
       end
@@ -123,12 +122,11 @@ class Configgin
         digests[name] = nil
       end
     end
-
     kube_client.update_secret(secret)
 
-    # Some pods might have depended on the properties exported by this pod; given
-    # the annotations expected on the pods (keyed by the instance group name),
-    # patch the StatefulSets such that they will be restarted.
+    # 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.
     expected_annotations(@job_configs, digests).each_pair do |instance_group_name, digests|
       # Avoid restarting our own pod
       next if instance_group_name == instance_group
@@ -143,16 +141,17 @@ class Configgin
             response = {}
           end
           if response['reason'] == 'NotFound'
-            # The StatefulSet can be missing if we're configured to not have an
-            # optional instance group.
+            # The StatefulSet can be missing if we're configured to not have an optional instance group.
             warn "Skipping patch of non-existant StatefulSet #{instance_group_name}"
             next
           end
-          warn "Error patching #{instance_group_name}: #{response.to_json}"
+          warn "Error fetching stateful set #{instance_group_name}: #{response.to_json}"
           raise
         end
       end
 
+      # Update annotations to match digests for current property values. The stateful set will
+      # 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|
         annotations[key] = value
@@ -166,7 +165,6 @@ class Configgin
         { spec: { template: { metadata: { annotations: annotations } } } },
         kube_namespace
       )
-      warn "Patched StatefulSet #{instance_group_name} for new exported digests"
     end
   end
 
@@ -192,7 +190,7 @@ class Configgin
   end
 
   def kube_token
-    @kube_token ||= File.read("#{SVC_ACC_PATH}/token")
+    @kube_token ||= ENV['CONFIGGIN_SA_TOKEN'] || File.read("#{SVC_ACC_PATH}/token")
   end
 
   private

data/lib/configgin/version.rb

@@ -1,3 +1,3 @@
 class Configgin
-  VERSION = '0.19.6'.freeze
+  VERSION = '0.20.0'.freeze
 end

data/lib/kube_link_generator.rb

@@ -80,7 +80,12 @@ class KubeLinkSpecs
     # This is done using the CONFIGGIN_IMPORT_ROLE environment variables referencing the version
     # tag in the corresponding secret.
     secret = client.get_secret(role_name, namespace)
-    JSON.parse(Base64.decode64(secret.data["skiff-exported-properties-#{job_name}"]))
+    begin
+      JSON.parse(Base64.decode64(secret.data["skiff-exported-properties-#{job_name}"]))
+    rescue
+      puts "Role #{role_name} is missing skiff-exported-properties-#{job_name}"
+      fail
+    end
   end
 
   def get_pod_instance_info(role_name, pod, job, pods_per_image)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configgin
 version: !ruby/object:Gem::Version
-  version: 0.19.6
+  version: 0.20.0
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler