airship
/
armada
Code Issues Proposed changes

Upgrade Tiller to v2.16.1 

This leaves support in Armada for tiller 2.13+ as
we don't use any new features since then, so don't
need to require a newer version.

Change-Id: I6e5343fe942794987bec140e23208dd04fcbfd44
This commit is contained in:
Samuel Pilla 2019-11-15 10:59:59 -06:00
parent 6a9b3bf9c9
commit 50384e47c7
16 changed files with 231 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/armada/values.yaml
View File

@ -34,7 +34,7 @@ images:
ks_service: 'docker.io/openstackhelm/heat:newton'
ks_user: 'docker.io/openstackhelm/heat:newton'
image_repo_sync: docker.io/docker:17.07.0
tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
pull_policy: "IfNotPresent"
local_registry:
active: false

2
charts/tiller/values.yaml
View File

@ -24,7 +24,7 @@ dependencies:
images:
tags:
tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
pull_policy: "IfNotPresent"
local_registry:
# NOTE(portdirect): this tiller chart does not support image pulling

9
hapi/chart/chart_pb2.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: hapi/chart/chart.proto
@ -96,11 +97,11 @@ _CHART.fields_by_name['files'].message_type = google_dot_protobuf_dot_any__pb2._
DESCRIPTOR.message_types_by_name['Chart'] = _CHART
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
Chart = _reflection.GeneratedProtocolMessageType('Chart', (_message.Message,), dict(
DESCRIPTOR = _CHART,
__module__ = 'hapi.chart.chart_pb2'
Chart = _reflection.GeneratedProtocolMessageType('Chart', (_message.Message,), {
'DESCRIPTOR' : _CHART,
'__module__' : 'hapi.chart.chart_pb2'
# @@protoc_insertion_point(class_scope:hapi.chart.Chart)
))
})
_sym_db.RegisterMessage(Chart)

25
hapi/chart/config_pb2.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: hapi/chart/config.proto
@ -137,26 +138,26 @@ DESCRIPTOR.message_types_by_name['Config'] = _CONFIG
DESCRIPTOR.message_types_by_name['Value'] = _VALUE
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), dict(
Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), {
ValuesEntry = _reflection.GeneratedProtocolMessageType('ValuesEntry', (_message.Message,), dict(
DESCRIPTOR = _CONFIG_VALUESENTRY,
__module__ = 'hapi.chart.config_pb2'
'ValuesEntry' : _reflection.GeneratedProtocolMessageType('ValuesEntry', (_message.Message,), {
'DESCRIPTOR' : _CONFIG_VALUESENTRY,
'__module__' : 'hapi.chart.config_pb2'
# @@protoc_insertion_point(class_scope:hapi.chart.Config.ValuesEntry)
))
})
,
DESCRIPTOR = _CONFIG,
__module__ = 'hapi.chart.config_pb2'
'DESCRIPTOR' : _CONFIG,
'__module__' : 'hapi.chart.config_pb2'
# @@protoc_insertion_point(class_scope:hapi.chart.Config)
))
})
_sym_db.RegisterMessage(Config)
_sym_db.RegisterMessage(Config.ValuesEntry)
Value = _reflection.GeneratedProtocolMessageType('Value', (_message.Message,), dict(
DESCRIPTOR = _VALUE,
__module__ = 'hapi.chart.config_pb2'
Value = _reflection.GeneratedProtocolMessageType('Value', (_message.Message,), {
'DESCRIPTOR' : _VALUE,
'__module__' : 'hapi.chart.config_pb2'
# @@protoc_insertion_point(class_scope:hapi.chart.Value)
))
})
_sym_db.RegisterMessage(Value)

25
hapi/chart/metadata_pb2.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: hapi/chart/metadata.proto
@ -280,25 +281,25 @@ DESCRIPTOR.message_types_by_name['Maintainer'] = _MAINTAINER
DESCRIPTOR.message_types_by_name['Metadata'] = _METADATA
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
Maintainer = _reflection.GeneratedProtocolMessageType('Maintainer', (_message.Message,), dict(
DESCRIPTOR = _MAINTAINER,
__module__ = 'hapi.chart.metadata_pb2'
Maintainer = _reflection.GeneratedProtocolMessageType('Maintainer', (_message.Message,), {
'DESCRIPTOR' : _MAINTAINER,
'__module__' : 'hapi.chart.metadata_pb2'
# @@protoc_insertion_point(class_scope:hapi.chart.Maintainer)
))
})
_sym_db.RegisterMessage(Maintainer)
Metadata = _reflection.GeneratedProtocolMessageType('Metadata', (_message.Message,), dict(
Metadata = _reflection.GeneratedProtocolMessageType('Metadata', (_message.Message,), {
AnnotationsEntry = _reflection.GeneratedProtocolMessageType('AnnotationsEntry', (_message.Message,), dict(
DESCRIPTOR = _METADATA_ANNOTATIONSENTRY,
__module__ = 'hapi.chart.metadata_pb2'
'AnnotationsEntry' : _reflection.GeneratedProtocolMessageType('AnnotationsEntry', (_message.Message,), {
'DESCRIPTOR' : _METADATA_ANNOTATIONSENTRY,
'__module__' : 'hapi.chart.metadata_pb2'
# @@protoc_insertion_point(class_scope:hapi.chart.Metadata.AnnotationsEntry)
))
})
,
DESCRIPTOR = _METADATA,
__module__ = 'hapi.chart.metadata_pb2'
'DESCRIPTOR' : _METADATA,
'__module__' : 'hapi.chart.metadata_pb2'
# @@protoc_insertion_point(class_scope:hapi.chart.Metadata)
))
})
_sym_db.RegisterMessage(Metadata)
_sym_db.RegisterMessage(Metadata.AnnotationsEntry)

9
hapi/chart/template_pb2.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: hapi/chart/template.proto
@ -65,11 +66,11 @@ _TEMPLATE = _descriptor.Descriptor(
DESCRIPTOR.message_types_by_name['Template'] = _TEMPLATE
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
Template = _reflection.GeneratedProtocolMessageType('Template', (_message.Message,), dict(
DESCRIPTOR = _TEMPLATE,
__module__ = 'hapi.chart.template_pb2'
Template = _reflection.GeneratedProtocolMessageType('Template', (_message.Message,), {
'DESCRIPTOR' : _TEMPLATE,
'__module__' : 'hapi.chart.template_pb2'
# @@protoc_insertion_point(class_scope:hapi.chart.Template)
))
})
_sym_db.RegisterMessage(Template)

28
hapi/release/hook_pb2.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: hapi/release/hook.proto
@ -20,7 +21,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
package='hapi.release',
syntax='proto3',
serialized_options=_b('Z\007release'),
serialized_pb=_b('\n\x17hapi/release/hook.proto\x12\x0chapi.release\x1a\x1fgoogle/protobuf/timestamp.proto\"\x91\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\"\xe5\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\x12\x0f\n\x0b\x43RD_INSTALL\x10\x0b\"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')
serialized_pb=_b('\n\x17hapi/release/hook.proto\x12\x0chapi.release\x1a\x1fgoogle/protobuf/timestamp.proto\"\xa9\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\x12\x16\n\x0e\x64\x65lete_timeout\x18\t \x01(\x03\"\xe5\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\x12\x0f\n\x0b\x43RD_INSTALL\x10\x0b\"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,])
@ -83,8 +84,8 @@ _HOOK_EVENT = _descriptor.EnumDescriptor(
],
containing_type=None,
serialized_options=None,
serialized_start=306,
serialized_end=535,
serialized_start=330,
serialized_end=559,
)
_sym_db.RegisterEnumDescriptor(_HOOK_EVENT)
@ -109,8 +110,8 @@ _HOOK_DELETEPOLICY = _descriptor.EnumDescriptor(
],
containing_type=None,
serialized_options=None,
serialized_start=537,
serialized_end=604,
serialized_start=561,
serialized_end=628,
)
_sym_db.RegisterEnumDescriptor(_HOOK_DELETEPOLICY)
@ -178,6 +179,13 @@ _HOOK = _descriptor.Descriptor(
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='delete_timeout', full_name='hapi.release.Hook.delete_timeout', index=8,
number=9, type=3, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@ -193,7 +201,7 @@ _HOOK = _descriptor.Descriptor(
oneofs=[
],
serialized_start=75,
serialized_end=604,
serialized_end=628,
)
_HOOK.fields_by_name['events'].enum_type = _HOOK_EVENT
@ -204,11 +212,11 @@ _HOOK_DELETEPOLICY.containing_type = _HOOK
DESCRIPTOR.message_types_by_name['Hook'] = _HOOK
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
Hook = _reflection.GeneratedProtocolMessageType('Hook', (_message.Message,), dict(
DESCRIPTOR = _HOOK,
__module__ = 'hapi.release.hook_pb2'
Hook = _reflection.GeneratedProtocolMessageType('Hook', (_message.Message,), {
'DESCRIPTOR' : _HOOK,
'__module__' : 'hapi.release.hook_pb2'
# @@protoc_insertion_point(class_scope:hapi.release.Hook)
))
})
_sym_db.RegisterMessage(Hook)

9
hapi/release/info_pb2.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: hapi/release/info.proto
@ -93,11 +94,11 @@ _INFO.fields_by_name['deleted'].message_type = google_dot_protobuf_dot_timestamp
DESCRIPTOR.message_types_by_name['Info'] = _INFO
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
Info = _reflection.GeneratedProtocolMessageType('Info', (_message.Message,), dict(
DESCRIPTOR = _INFO,
__module__ = 'hapi.release.info_pb2'
Info = _reflection.GeneratedProtocolMessageType('Info', (_message.Message,), {
'DESCRIPTOR' : _INFO,
'__module__' : 'hapi.release.info_pb2'
# @@protoc_insertion_point(class_scope:hapi.release.Info)
))
})
_sym_db.RegisterMessage(Info)

9
hapi/release/release_pb2.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: hapi/release/release.proto
@ -116,11 +117,11 @@ _RELEASE.fields_by_name['hooks'].message_type = hapi_dot_release_dot_hook__pb2._
DESCRIPTOR.message_types_by_name['Release'] = _RELEASE
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
Release = _reflection.GeneratedProtocolMessageType('Release', (_message.Message,), dict(
DESCRIPTOR = _RELEASE,
__module__ = 'hapi.release.release_pb2'
Release = _reflection.GeneratedProtocolMessageType('Release', (_message.Message,), {
'DESCRIPTOR' : _RELEASE,
'__module__' : 'hapi.release.release_pb2'
# @@protoc_insertion_point(class_scope:hapi.release.Release)
))
})
_sym_db.RegisterMessage(Release)

9
hapi/release/status_pb2.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: hapi/release/status.proto
@ -136,11 +137,11 @@ _STATUS_CODE.containing_type = _STATUS
DESCRIPTOR.message_types_by_name['Status'] = _STATUS
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,), dict(
DESCRIPTOR = _STATUS,
__module__ = 'hapi.release.status_pb2'
Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,), {
'DESCRIPTOR' : _STATUS,
'__module__' : 'hapi.release.status_pb2'
# @@protoc_insertion_point(class_scope:hapi.release.Status)
))
})
_sym_db.RegisterMessage(Status)

9
hapi/release/test_run_pb2.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: hapi/release/test_run.proto
@ -123,11 +124,11 @@ _TESTRUN_STATUS.containing_type = _TESTRUN
DESCRIPTOR.message_types_by_name['TestRun'] = _TESTRUN
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
TestRun = _reflection.GeneratedProtocolMessageType('TestRun', (_message.Message,), dict(
DESCRIPTOR = _TESTRUN,
__module__ = 'hapi.release.test_run_pb2'
TestRun = _reflection.GeneratedProtocolMessageType('TestRun', (_message.Message,), {
'DESCRIPTOR' : _TESTRUN,
'__module__' : 'hapi.release.test_run_pb2'
# @@protoc_insertion_point(class_scope:hapi.release.TestRun)
))
})
_sym_db.RegisterMessage(TestRun)

9
hapi/release/test_suite_pb2.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: hapi/release/test_suite.proto
@ -78,11 +79,11 @@ _TESTSUITE.fields_by_name['results'].message_type = hapi_dot_release_dot_test__r
DESCRIPTOR.message_types_by_name['TestSuite'] = _TESTSUITE
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
TestSuite = _reflection.GeneratedProtocolMessageType('TestSuite', (_message.Message,), dict(
DESCRIPTOR = _TESTSUITE,
__module__ = 'hapi.release.test_suite_pb2'
TestSuite = _reflection.GeneratedProtocolMessageType('TestSuite', (_message.Message,), {
'DESCRIPTOR' : _TESTSUITE,
'__module__' : 'hapi.release.test_suite_pb2'
# @@protoc_insertion_point(class_scope:hapi.release.TestSuite)
))
})
_sym_db.RegisterMessage(TestSuite)

257
hapi/services/tiller_pb2.py
View File

File diff suppressed because one or more lines are too long

9
hapi/version/version_pb2.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: hapi/version/version.proto
@ -72,11 +73,11 @@ _VERSION = _descriptor.Descriptor(
DESCRIPTOR.message_types_by_name['Version'] = _VERSION
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
Version = _reflection.GeneratedProtocolMessageType('Version', (_message.Message,), dict(
DESCRIPTOR = _VERSION,
__module__ = 'hapi.version.version_pb2'
Version = _reflection.GeneratedProtocolMessageType('Version', (_message.Message,), {
'DESCRIPTOR' : _VERSION,
'__module__' : 'hapi.version.version_pb2'
# @@protoc_insertion_point(class_scope:hapi.version.Version)
))
})
_sym_db.RegisterMessage(Version)

2
tools/helm-hapi.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
HELM_BRANCH='v2.13.1'
HELM_BRANCH='v2.16.1'
git clone https://github.com/helm/helm ./helm -b $HELM_BRANCH

2
tools/helm_install.sh
View File

@ -17,7 +17,7 @@
set -x
HELM=$1
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz"}
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.16.1-linux-amd64.tar.gz"}
function install_helm_binary {