Update Helm version

- Update Helm to v2.9.1 - Update hapi protoc gen files - Update kubernetes client to >=6 Change-Id: I53480e26683cbaa2b148aaa0f574ee7fb6147ce5
2018-07-09 22:02:11 -05:00 · 2018-07-09 22:02:11 -05:00 · 68a507e81b
commit 68a507e81b
parent cd0242780e
6 changed files with 33 additions and 15 deletions
--- a/armada/handlers/tiller.py
+++ b/armada/handlers/tiller.py
@ -35,7 +35,7 @@ from armada.handlers.k8s import K8s
 from armada.handlers import test
 from armada.utils.release import label_selectors

-TILLER_VERSION = b'2.7.2'
+TILLER_VERSION = b'2.9.1'
 GRPC_EPSILON = 60
 RELEASE_LIMIT = 128  # TODO(mark-burnett): There may be a better page size.

--- a/charts/tiller/values.yaml
+++ b/charts/tiller/values.yaml
@ -20,7 +20,7 @@ dependencies:

 images:
  tags:
-    tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
+    tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
  pull_policy: "IfNotPresent"
  local_registry:
    # NOTE(portdirect): this tiller chart does not support image pulling
--- a/hapi/chart/metadata_pb2.py
+++ b/hapi/chart/metadata_pb2.py
@ -19,7 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
  name='hapi/chart/metadata.proto',
  package='hapi.chart',
  syntax='proto3',
-  serialized_pb=_b('\n\x19hapi/chart/metadata.proto\x12\nhapi.chart\")\n\nMaintainer\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05\x65mail\x18\x02 \x01(\t\"\xc0\x03\n\x08Metadata\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04home\x18\x02 \x01(\t\x12\x0f\n\x07sources\x18\x03 \x03(\t\x12\x0f\n\x07version\x18\x04 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x05 \x01(\t\x12\x10\n\x08keywords\x18\x06 \x03(\t\x12+\n\x0bmaintainers\x18\x07 \x03(\x0b\x32\x16.hapi.chart.Maintainer\x12\x0e\n\x06\x65ngine\x18\x08 \x01(\t\x12\x0c\n\x04icon\x18\t \x01(\t\x12\x12\n\napiVersion\x18\n \x01(\t\x12\x11\n\tcondition\x18\x0b \x01(\t\x12\x0c\n\x04tags\x18\x0c \x01(\t\x12\x12\n\nappVersion\x18\r \x01(\t\x12\x12\n\ndeprecated\x18\x0e \x01(\x08\x12\x15\n\rtillerVersion\x18\x0f \x01(\t\x12:\n\x0b\x61nnotations\x18\x10 \x03(\x0b\x32%.hapi.chart.Metadata.AnnotationsEntry\x1a\x32\n\x10\x41nnotationsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\" \n\x06\x45ngine\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05GOTPL\x10\x01\x42\x07Z\x05\x63hartb\x06proto3')
+  serialized_pb=_b('\n\x19hapi/chart/metadata.proto\x12\nhapi.chart\"6\n\nMaintainer\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05\x65mail\x18\x02 \x01(\t\x12\x0b\n\x03url\x18\x03 \x01(\t\"\xd5\x03\n\x08Metadata\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04home\x18\x02 \x01(\t\x12\x0f\n\x07sources\x18\x03 \x03(\t\x12\x0f\n\x07version\x18\x04 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x05 \x01(\t\x12\x10\n\x08keywords\x18\x06 \x03(\t\x12+\n\x0bmaintainers\x18\x07 \x03(\x0b\x32\x16.hapi.chart.Maintainer\x12\x0e\n\x06\x65ngine\x18\x08 \x01(\t\x12\x0c\n\x04icon\x18\t \x01(\t\x12\x12\n\napiVersion\x18\n \x01(\t\x12\x11\n\tcondition\x18\x0b \x01(\t\x12\x0c\n\x04tags\x18\x0c \x01(\t\x12\x12\n\nappVersion\x18\r \x01(\t\x12\x12\n\ndeprecated\x18\x0e \x01(\x08\x12\x15\n\rtillerVersion\x18\x0f \x01(\t\x12:\n\x0b\x61nnotations\x18\x10 \x03(\x0b\x32%.hapi.chart.Metadata.AnnotationsEntry\x12\x13\n\x0bkubeVersion\x18\x11 \x01(\t\x1a\x32\n\x10\x41nnotationsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\" \n\x06\x45ngine\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05GOTPL\x10\x01\x42\x07Z\x05\x63hartb\x06proto3')
 )


@ -41,8 +41,8 @@ _METADATA_ENGINE = _descriptor.EnumDescriptor(
  ],
  containing_type=None,
  options=None,
-  serialized_start=501,
-  serialized_end=533,
+  serialized_start=535,
+  serialized_end=567,
 )
 _sym_db.RegisterEnumDescriptor(_METADATA_ENGINE)

@ -68,6 +68,13 @@ _MAINTAINER = _descriptor.Descriptor(
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='url', full_name='hapi.chart.Maintainer.url', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None, file=DESCRIPTOR),
  ],
  extensions=[
  ],
@ -81,7 +88,7 @@ _MAINTAINER = _descriptor.Descriptor(
  oneofs=[
  ],
  serialized_start=41,
-  serialized_end=82,
+  serialized_end=95,
 )


@ -118,8 +125,8 @@ _METADATA_ANNOTATIONSENTRY = _descriptor.Descriptor(
  extension_ranges=[],
  oneofs=[
  ],
-  serialized_start=449,
-  serialized_end=499,
+  serialized_start=483,
+  serialized_end=533,
 )

 _METADATA = _descriptor.Descriptor(
@ -241,6 +248,13 @@ _METADATA = _descriptor.Descriptor(
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='kubeVersion', full_name='hapi.chart.Metadata.kubeVersion', index=16,
+      number=17, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None, file=DESCRIPTOR),
  ],
  extensions=[
  ],
@ -254,8 +268,8 @@ _METADATA = _descriptor.Descriptor(
  extension_ranges=[],
  oneofs=[
  ],
-  serialized_start=85,
-  serialized_end=533,
+  serialized_start=98,
+  serialized_end=567,
 )

 _METADATA_ANNOTATIONSENTRY.containing_type = _METADATA
--- a/hapi/release/hook_pb2.py
+++ b/hapi/release/hook_pb2.py
@ -20,7 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
  name='hapi/release/hook.proto',
  package='hapi.release',
  syntax='proto3',
-  serialized_pb=_b('\n\x17hapi/release/hook.proto\x12\x0chapi.release\x1a\x1fgoogle/protobuf/timestamp.proto\"\xe6\x03\n\x04Hook\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04kind\x18\x02 \x01(\t\x12\x0c\n\x04path\x18\x03 \x01(\t\x12\x10\n\x08manifest\x18\x04 \x01(\t\x12(\n\x06\x65vents\x18\x05 \x03(\x0e\x32\x18.hapi.release.Hook.Event\x12,\n\x08last_run\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0e\n\x06weight\x18\x07 \x01(\x05\x12\x38\n\x0f\x64\x65lete_policies\x18\x08 \x03(\x0e\x32\x1f.hapi.release.Hook.DeletePolicy\"\xd4\x01\n\x05\x45vent\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0f\n\x0bPRE_INSTALL\x10\x01\x12\x10\n\x0cPOST_INSTALL\x10\x02\x12\x0e\n\nPRE_DELETE\x10\x03\x12\x0f\n\x0bPOST_DELETE\x10\x04\x12\x0f\n\x0bPRE_UPGRADE\x10\x05\x12\x10\n\x0cPOST_UPGRADE\x10\x06\x12\x10\n\x0cPRE_ROLLBACK\x10\x07\x12\x11\n\rPOST_ROLLBACK\x10\x08\x12\x18\n\x14RELEASE_TEST_SUCCESS\x10\t\x12\x18\n\x14RELEASE_TEST_FAILURE\x10\n\")\n\x0c\x44\x65letePolicy\x12\r\n\tSUCCEEDED\x10\x00\x12\n\n\x06\x46\x41ILED\x10\x01\x42\tZ\x07releaseb\x06proto3')
+  serialized_pb=_b('\n\x17hapi/release/hook.proto\x12\x0chapi.release\x1a\x1fgoogle/protobuf/timestamp.proto\"\x80\x04\n\x04Hook\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04kind\x18\x02 \x01(\t\x12\x0c\n\x04path\x18\x03 \x01(\t\x12\x10\n\x08manifest\x18\x04 \x01(\t\x12(\n\x06\x65vents\x18\x05 \x03(\x0e\x32\x18.hapi.release.Hook.Event\x12,\n\x08last_run\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0e\n\x06weight\x18\x07 \x01(\x05\x12\x38\n\x0f\x64\x65lete_policies\x18\x08 \x03(\x0e\x32\x1f.hapi.release.Hook.DeletePolicy\"\xd4\x01\n\x05\x45vent\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0f\n\x0bPRE_INSTALL\x10\x01\x12\x10\n\x0cPOST_INSTALL\x10\x02\x12\x0e\n\nPRE_DELETE\x10\x03\x12\x0f\n\x0bPOST_DELETE\x10\x04\x12\x0f\n\x0bPRE_UPGRADE\x10\x05\x12\x10\n\x0cPOST_UPGRADE\x10\x06\x12\x10\n\x0cPRE_ROLLBACK\x10\x07\x12\x11\n\rPOST_ROLLBACK\x10\x08\x12\x18\n\x14RELEASE_TEST_SUCCESS\x10\t\x12\x18\n\x14RELEASE_TEST_FAILURE\x10\n\"C\n\x0c\x44\x65letePolicy\x12\r\n\tSUCCEEDED\x10\x00\x12\n\n\x06\x46\x41ILED\x10\x01\x12\x18\n\x14\x42\x45\x46ORE_HOOK_CREATION\x10\x02\x42\tZ\x07releaseb\x06proto3')
  ,
  dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,])

@ -98,11 +98,15 @@ _HOOK_DELETEPOLICY = _descriptor.EnumDescriptor(
      name='FAILED', index=1, number=1,
      options=None,
      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BEFORE_HOOK_CREATION', index=2, number=2,
+      options=None,
+      type=None),
  ],
  containing_type=None,
  options=None,
  serialized_start=520,
-  serialized_end=561,
+  serialized_end=587,
 )
 _sym_db.RegisterEnumDescriptor(_HOOK_DELETEPOLICY)

@ -185,7 +189,7 @@ _HOOK = _descriptor.Descriptor(
  oneofs=[
  ],
  serialized_start=75,
-  serialized_end=561,
+  serialized_end=587,
 )

 _HOOK.fields_by_name['events'].enum_type = _HOOK_EVENT
--- a/requirements.txt
+++ b/requirements.txt
@ -4,7 +4,7 @@ grpcio-tools==1.10.0
 jsonschema>=2.6.0
 keystoneauth1==2.21.0
 keystonemiddleware==4.9.1
-kubernetes>=1.0.0
+kubernetes>=6.0.0
 Paste>=2.0.3
 PasteDeploy>=1.5.2
 protobuf>=3.4.0
--- a/tools/helm-hapi.sh
+++ b/tools/helm-hapi.sh
@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-HELM_BRANCH='release-2.7'
+HELM_BRANCH='release-2.9'

 git clone https://github.com/kubernetes/helm ./helm -b $HELM_BRANCH