diff --git a/armada/handlers/tiller.py b/armada/handlers/tiller.py index 3832f50c..77fa4a3c 100644 --- a/armada/handlers/tiller.py +++ b/armada/handlers/tiller.py @@ -36,7 +36,7 @@ from armada.handlers import schema from armada.utils import helm from armada.utils.release import label_selectors, get_release_status -TILLER_VERSION = b'2.13.1' +TILLER_VERSION = b'2.16.9' GRPC_EPSILON = 60 LIST_RELEASES_PAGE_SIZE = 32 LIST_RELEASES_ATTEMPTS = 3 diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml index d5f62409..fd4b4759 100644 --- a/charts/armada/values.yaml +++ b/charts/armada/values.yaml @@ -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.16.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.9 pull_policy: "IfNotPresent" local_registry: active: false diff --git a/charts/tiller/values.yaml b/charts/tiller/values.yaml index dd76a859..7ec76ef9 100644 --- a/charts/tiller/values.yaml +++ b/charts/tiller/values.yaml @@ -24,7 +24,7 @@ dependencies: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.9 pull_policy: "IfNotPresent" local_registry: # NOTE(portdirect): this tiller chart does not support image pulling diff --git a/hapi/chart/chart_pb2.py b/hapi/chart/chart_pb2.py index cc1b68fc..837d4c3f 100644 --- a/hapi/chart/chart_pb2.py +++ b/hapi/chart/chart_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/chart/chart.proto @@ -97,11 +96,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,), { - 'DESCRIPTOR' : _CHART, - '__module__' : 'hapi.chart.chart_pb2' +Chart = _reflection.GeneratedProtocolMessageType('Chart', (_message.Message,), dict( + DESCRIPTOR = _CHART, + __module__ = 'hapi.chart.chart_pb2' # @@protoc_insertion_point(class_scope:hapi.chart.Chart) - }) + )) _sym_db.RegisterMessage(Chart) diff --git a/hapi/chart/config_pb2.py b/hapi/chart/config_pb2.py index b05f6fc9..394cd9b8 100644 --- a/hapi/chart/config_pb2.py +++ b/hapi/chart/config_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/chart/config.proto @@ -138,26 +137,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,), { +Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), dict( - 'ValuesEntry' : _reflection.GeneratedProtocolMessageType('ValuesEntry', (_message.Message,), { - 'DESCRIPTOR' : _CONFIG_VALUESENTRY, - '__module__' : 'hapi.chart.config_pb2' + ValuesEntry = _reflection.GeneratedProtocolMessageType('ValuesEntry', (_message.Message,), dict( + 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,), { - 'DESCRIPTOR' : _VALUE, - '__module__' : 'hapi.chart.config_pb2' +Value = _reflection.GeneratedProtocolMessageType('Value', (_message.Message,), dict( + DESCRIPTOR = _VALUE, + __module__ = 'hapi.chart.config_pb2' # @@protoc_insertion_point(class_scope:hapi.chart.Value) - }) + )) _sym_db.RegisterMessage(Value) diff --git a/hapi/chart/metadata_pb2.py b/hapi/chart/metadata_pb2.py index 44db80c5..28699f70 100644 --- a/hapi/chart/metadata_pb2.py +++ b/hapi/chart/metadata_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/chart/metadata.proto @@ -281,25 +280,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,), { - 'DESCRIPTOR' : _MAINTAINER, - '__module__' : 'hapi.chart.metadata_pb2' +Maintainer = _reflection.GeneratedProtocolMessageType('Maintainer', (_message.Message,), dict( + 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,), { +Metadata = _reflection.GeneratedProtocolMessageType('Metadata', (_message.Message,), dict( - 'AnnotationsEntry' : _reflection.GeneratedProtocolMessageType('AnnotationsEntry', (_message.Message,), { - 'DESCRIPTOR' : _METADATA_ANNOTATIONSENTRY, - '__module__' : 'hapi.chart.metadata_pb2' + AnnotationsEntry = _reflection.GeneratedProtocolMessageType('AnnotationsEntry', (_message.Message,), dict( + 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) diff --git a/hapi/chart/template_pb2.py b/hapi/chart/template_pb2.py index 3e5e4cf6..3ad371a4 100644 --- a/hapi/chart/template_pb2.py +++ b/hapi/chart/template_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/chart/template.proto @@ -66,11 +65,11 @@ _TEMPLATE = _descriptor.Descriptor( DESCRIPTOR.message_types_by_name['Template'] = _TEMPLATE _sym_db.RegisterFileDescriptor(DESCRIPTOR) -Template = _reflection.GeneratedProtocolMessageType('Template', (_message.Message,), { - 'DESCRIPTOR' : _TEMPLATE, - '__module__' : 'hapi.chart.template_pb2' +Template = _reflection.GeneratedProtocolMessageType('Template', (_message.Message,), dict( + DESCRIPTOR = _TEMPLATE, + __module__ = 'hapi.chart.template_pb2' # @@protoc_insertion_point(class_scope:hapi.chart.Template) - }) + )) _sym_db.RegisterMessage(Template) diff --git a/hapi/release/hook_pb2.py b/hapi/release/hook_pb2.py index fd2abd3a..23384717 100644 --- a/hapi/release/hook_pb2.py +++ b/hapi/release/hook_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/release/hook.proto @@ -212,11 +211,11 @@ _HOOK_DELETEPOLICY.containing_type = _HOOK DESCRIPTOR.message_types_by_name['Hook'] = _HOOK _sym_db.RegisterFileDescriptor(DESCRIPTOR) -Hook = _reflection.GeneratedProtocolMessageType('Hook', (_message.Message,), { - 'DESCRIPTOR' : _HOOK, - '__module__' : 'hapi.release.hook_pb2' +Hook = _reflection.GeneratedProtocolMessageType('Hook', (_message.Message,), dict( + DESCRIPTOR = _HOOK, + __module__ = 'hapi.release.hook_pb2' # @@protoc_insertion_point(class_scope:hapi.release.Hook) - }) + )) _sym_db.RegisterMessage(Hook) diff --git a/hapi/release/info_pb2.py b/hapi/release/info_pb2.py index 8d4adfef..1a691cae 100644 --- a/hapi/release/info_pb2.py +++ b/hapi/release/info_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/release/info.proto @@ -94,11 +93,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,), { - 'DESCRIPTOR' : _INFO, - '__module__' : 'hapi.release.info_pb2' +Info = _reflection.GeneratedProtocolMessageType('Info', (_message.Message,), dict( + DESCRIPTOR = _INFO, + __module__ = 'hapi.release.info_pb2' # @@protoc_insertion_point(class_scope:hapi.release.Info) - }) + )) _sym_db.RegisterMessage(Info) diff --git a/hapi/release/release_pb2.py b/hapi/release/release_pb2.py index 6f77264c..ddd03f06 100644 --- a/hapi/release/release_pb2.py +++ b/hapi/release/release_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/release/release.proto @@ -117,11 +116,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,), { - 'DESCRIPTOR' : _RELEASE, - '__module__' : 'hapi.release.release_pb2' +Release = _reflection.GeneratedProtocolMessageType('Release', (_message.Message,), dict( + DESCRIPTOR = _RELEASE, + __module__ = 'hapi.release.release_pb2' # @@protoc_insertion_point(class_scope:hapi.release.Release) - }) + )) _sym_db.RegisterMessage(Release) diff --git a/hapi/release/status_pb2.py b/hapi/release/status_pb2.py index 03b32f7e..e03b08af 100644 --- a/hapi/release/status_pb2.py +++ b/hapi/release/status_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/release/status.proto @@ -137,11 +136,11 @@ _STATUS_CODE.containing_type = _STATUS DESCRIPTOR.message_types_by_name['Status'] = _STATUS _sym_db.RegisterFileDescriptor(DESCRIPTOR) -Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,), { - 'DESCRIPTOR' : _STATUS, - '__module__' : 'hapi.release.status_pb2' +Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,), dict( + DESCRIPTOR = _STATUS, + __module__ = 'hapi.release.status_pb2' # @@protoc_insertion_point(class_scope:hapi.release.Status) - }) + )) _sym_db.RegisterMessage(Status) diff --git a/hapi/release/test_run_pb2.py b/hapi/release/test_run_pb2.py index 0b7209a8..120d7279 100644 --- a/hapi/release/test_run_pb2.py +++ b/hapi/release/test_run_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/release/test_run.proto @@ -124,11 +123,11 @@ _TESTRUN_STATUS.containing_type = _TESTRUN DESCRIPTOR.message_types_by_name['TestRun'] = _TESTRUN _sym_db.RegisterFileDescriptor(DESCRIPTOR) -TestRun = _reflection.GeneratedProtocolMessageType('TestRun', (_message.Message,), { - 'DESCRIPTOR' : _TESTRUN, - '__module__' : 'hapi.release.test_run_pb2' +TestRun = _reflection.GeneratedProtocolMessageType('TestRun', (_message.Message,), dict( + DESCRIPTOR = _TESTRUN, + __module__ = 'hapi.release.test_run_pb2' # @@protoc_insertion_point(class_scope:hapi.release.TestRun) - }) + )) _sym_db.RegisterMessage(TestRun) diff --git a/hapi/release/test_suite_pb2.py b/hapi/release/test_suite_pb2.py index b43d877a..036a3faa 100644 --- a/hapi/release/test_suite_pb2.py +++ b/hapi/release/test_suite_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/release/test_suite.proto @@ -79,11 +78,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,), { - 'DESCRIPTOR' : _TESTSUITE, - '__module__' : 'hapi.release.test_suite_pb2' +TestSuite = _reflection.GeneratedProtocolMessageType('TestSuite', (_message.Message,), dict( + DESCRIPTOR = _TESTSUITE, + __module__ = 'hapi.release.test_suite_pb2' # @@protoc_insertion_point(class_scope:hapi.release.TestSuite) - }) + )) _sym_db.RegisterMessage(TestSuite) diff --git a/hapi/services/tiller_pb2.py b/hapi/services/tiller_pb2.py index 3ec5a3eb..16780ed1 100644 --- a/hapi/services/tiller_pb2.py +++ b/hapi/services/tiller_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/services/tiller.proto @@ -1172,151 +1171,151 @@ DESCRIPTOR.message_types_by_name['TestReleaseRequest'] = _TESTRELEASEREQUEST DESCRIPTOR.message_types_by_name['TestReleaseResponse'] = _TESTRELEASERESPONSE _sym_db.RegisterFileDescriptor(DESCRIPTOR) -ListReleasesRequest = _reflection.GeneratedProtocolMessageType('ListReleasesRequest', (_message.Message,), { - 'DESCRIPTOR' : _LISTRELEASESREQUEST, - '__module__' : 'hapi.services.tiller_pb2' +ListReleasesRequest = _reflection.GeneratedProtocolMessageType('ListReleasesRequest', (_message.Message,), dict( + DESCRIPTOR = _LISTRELEASESREQUEST, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.ListReleasesRequest) - }) + )) _sym_db.RegisterMessage(ListReleasesRequest) -ListSort = _reflection.GeneratedProtocolMessageType('ListSort', (_message.Message,), { - 'DESCRIPTOR' : _LISTSORT, - '__module__' : 'hapi.services.tiller_pb2' +ListSort = _reflection.GeneratedProtocolMessageType('ListSort', (_message.Message,), dict( + DESCRIPTOR = _LISTSORT, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.ListSort) - }) + )) _sym_db.RegisterMessage(ListSort) -ListReleasesResponse = _reflection.GeneratedProtocolMessageType('ListReleasesResponse', (_message.Message,), { - 'DESCRIPTOR' : _LISTRELEASESRESPONSE, - '__module__' : 'hapi.services.tiller_pb2' +ListReleasesResponse = _reflection.GeneratedProtocolMessageType('ListReleasesResponse', (_message.Message,), dict( + DESCRIPTOR = _LISTRELEASESRESPONSE, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.ListReleasesResponse) - }) + )) _sym_db.RegisterMessage(ListReleasesResponse) -GetReleaseStatusRequest = _reflection.GeneratedProtocolMessageType('GetReleaseStatusRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETRELEASESTATUSREQUEST, - '__module__' : 'hapi.services.tiller_pb2' +GetReleaseStatusRequest = _reflection.GeneratedProtocolMessageType('GetReleaseStatusRequest', (_message.Message,), dict( + DESCRIPTOR = _GETRELEASESTATUSREQUEST, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.GetReleaseStatusRequest) - }) + )) _sym_db.RegisterMessage(GetReleaseStatusRequest) -GetReleaseStatusResponse = _reflection.GeneratedProtocolMessageType('GetReleaseStatusResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETRELEASESTATUSRESPONSE, - '__module__' : 'hapi.services.tiller_pb2' +GetReleaseStatusResponse = _reflection.GeneratedProtocolMessageType('GetReleaseStatusResponse', (_message.Message,), dict( + DESCRIPTOR = _GETRELEASESTATUSRESPONSE, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.GetReleaseStatusResponse) - }) + )) _sym_db.RegisterMessage(GetReleaseStatusResponse) -GetReleaseContentRequest = _reflection.GeneratedProtocolMessageType('GetReleaseContentRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETRELEASECONTENTREQUEST, - '__module__' : 'hapi.services.tiller_pb2' +GetReleaseContentRequest = _reflection.GeneratedProtocolMessageType('GetReleaseContentRequest', (_message.Message,), dict( + DESCRIPTOR = _GETRELEASECONTENTREQUEST, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.GetReleaseContentRequest) - }) + )) _sym_db.RegisterMessage(GetReleaseContentRequest) -GetReleaseContentResponse = _reflection.GeneratedProtocolMessageType('GetReleaseContentResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETRELEASECONTENTRESPONSE, - '__module__' : 'hapi.services.tiller_pb2' +GetReleaseContentResponse = _reflection.GeneratedProtocolMessageType('GetReleaseContentResponse', (_message.Message,), dict( + DESCRIPTOR = _GETRELEASECONTENTRESPONSE, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.GetReleaseContentResponse) - }) + )) _sym_db.RegisterMessage(GetReleaseContentResponse) -UpdateReleaseRequest = _reflection.GeneratedProtocolMessageType('UpdateReleaseRequest', (_message.Message,), { - 'DESCRIPTOR' : _UPDATERELEASEREQUEST, - '__module__' : 'hapi.services.tiller_pb2' +UpdateReleaseRequest = _reflection.GeneratedProtocolMessageType('UpdateReleaseRequest', (_message.Message,), dict( + DESCRIPTOR = _UPDATERELEASEREQUEST, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.UpdateReleaseRequest) - }) + )) _sym_db.RegisterMessage(UpdateReleaseRequest) -UpdateReleaseResponse = _reflection.GeneratedProtocolMessageType('UpdateReleaseResponse', (_message.Message,), { - 'DESCRIPTOR' : _UPDATERELEASERESPONSE, - '__module__' : 'hapi.services.tiller_pb2' +UpdateReleaseResponse = _reflection.GeneratedProtocolMessageType('UpdateReleaseResponse', (_message.Message,), dict( + DESCRIPTOR = _UPDATERELEASERESPONSE, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.UpdateReleaseResponse) - }) + )) _sym_db.RegisterMessage(UpdateReleaseResponse) -RollbackReleaseRequest = _reflection.GeneratedProtocolMessageType('RollbackReleaseRequest', (_message.Message,), { - 'DESCRIPTOR' : _ROLLBACKRELEASEREQUEST, - '__module__' : 'hapi.services.tiller_pb2' +RollbackReleaseRequest = _reflection.GeneratedProtocolMessageType('RollbackReleaseRequest', (_message.Message,), dict( + DESCRIPTOR = _ROLLBACKRELEASEREQUEST, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.RollbackReleaseRequest) - }) + )) _sym_db.RegisterMessage(RollbackReleaseRequest) -RollbackReleaseResponse = _reflection.GeneratedProtocolMessageType('RollbackReleaseResponse', (_message.Message,), { - 'DESCRIPTOR' : _ROLLBACKRELEASERESPONSE, - '__module__' : 'hapi.services.tiller_pb2' +RollbackReleaseResponse = _reflection.GeneratedProtocolMessageType('RollbackReleaseResponse', (_message.Message,), dict( + DESCRIPTOR = _ROLLBACKRELEASERESPONSE, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.RollbackReleaseResponse) - }) + )) _sym_db.RegisterMessage(RollbackReleaseResponse) -InstallReleaseRequest = _reflection.GeneratedProtocolMessageType('InstallReleaseRequest', (_message.Message,), { - 'DESCRIPTOR' : _INSTALLRELEASEREQUEST, - '__module__' : 'hapi.services.tiller_pb2' +InstallReleaseRequest = _reflection.GeneratedProtocolMessageType('InstallReleaseRequest', (_message.Message,), dict( + DESCRIPTOR = _INSTALLRELEASEREQUEST, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.InstallReleaseRequest) - }) + )) _sym_db.RegisterMessage(InstallReleaseRequest) -InstallReleaseResponse = _reflection.GeneratedProtocolMessageType('InstallReleaseResponse', (_message.Message,), { - 'DESCRIPTOR' : _INSTALLRELEASERESPONSE, - '__module__' : 'hapi.services.tiller_pb2' +InstallReleaseResponse = _reflection.GeneratedProtocolMessageType('InstallReleaseResponse', (_message.Message,), dict( + DESCRIPTOR = _INSTALLRELEASERESPONSE, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.InstallReleaseResponse) - }) + )) _sym_db.RegisterMessage(InstallReleaseResponse) -UninstallReleaseRequest = _reflection.GeneratedProtocolMessageType('UninstallReleaseRequest', (_message.Message,), { - 'DESCRIPTOR' : _UNINSTALLRELEASEREQUEST, - '__module__' : 'hapi.services.tiller_pb2' +UninstallReleaseRequest = _reflection.GeneratedProtocolMessageType('UninstallReleaseRequest', (_message.Message,), dict( + DESCRIPTOR = _UNINSTALLRELEASEREQUEST, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.UninstallReleaseRequest) - }) + )) _sym_db.RegisterMessage(UninstallReleaseRequest) -UninstallReleaseResponse = _reflection.GeneratedProtocolMessageType('UninstallReleaseResponse', (_message.Message,), { - 'DESCRIPTOR' : _UNINSTALLRELEASERESPONSE, - '__module__' : 'hapi.services.tiller_pb2' +UninstallReleaseResponse = _reflection.GeneratedProtocolMessageType('UninstallReleaseResponse', (_message.Message,), dict( + DESCRIPTOR = _UNINSTALLRELEASERESPONSE, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.UninstallReleaseResponse) - }) + )) _sym_db.RegisterMessage(UninstallReleaseResponse) -GetVersionRequest = _reflection.GeneratedProtocolMessageType('GetVersionRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETVERSIONREQUEST, - '__module__' : 'hapi.services.tiller_pb2' +GetVersionRequest = _reflection.GeneratedProtocolMessageType('GetVersionRequest', (_message.Message,), dict( + DESCRIPTOR = _GETVERSIONREQUEST, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.GetVersionRequest) - }) + )) _sym_db.RegisterMessage(GetVersionRequest) -GetVersionResponse = _reflection.GeneratedProtocolMessageType('GetVersionResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETVERSIONRESPONSE, - '__module__' : 'hapi.services.tiller_pb2' +GetVersionResponse = _reflection.GeneratedProtocolMessageType('GetVersionResponse', (_message.Message,), dict( + DESCRIPTOR = _GETVERSIONRESPONSE, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.GetVersionResponse) - }) + )) _sym_db.RegisterMessage(GetVersionResponse) -GetHistoryRequest = _reflection.GeneratedProtocolMessageType('GetHistoryRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETHISTORYREQUEST, - '__module__' : 'hapi.services.tiller_pb2' +GetHistoryRequest = _reflection.GeneratedProtocolMessageType('GetHistoryRequest', (_message.Message,), dict( + DESCRIPTOR = _GETHISTORYREQUEST, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.GetHistoryRequest) - }) + )) _sym_db.RegisterMessage(GetHistoryRequest) -GetHistoryResponse = _reflection.GeneratedProtocolMessageType('GetHistoryResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETHISTORYRESPONSE, - '__module__' : 'hapi.services.tiller_pb2' +GetHistoryResponse = _reflection.GeneratedProtocolMessageType('GetHistoryResponse', (_message.Message,), dict( + DESCRIPTOR = _GETHISTORYRESPONSE, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.GetHistoryResponse) - }) + )) _sym_db.RegisterMessage(GetHistoryResponse) -TestReleaseRequest = _reflection.GeneratedProtocolMessageType('TestReleaseRequest', (_message.Message,), { - 'DESCRIPTOR' : _TESTRELEASEREQUEST, - '__module__' : 'hapi.services.tiller_pb2' +TestReleaseRequest = _reflection.GeneratedProtocolMessageType('TestReleaseRequest', (_message.Message,), dict( + DESCRIPTOR = _TESTRELEASEREQUEST, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.TestReleaseRequest) - }) + )) _sym_db.RegisterMessage(TestReleaseRequest) -TestReleaseResponse = _reflection.GeneratedProtocolMessageType('TestReleaseResponse', (_message.Message,), { - 'DESCRIPTOR' : _TESTRELEASERESPONSE, - '__module__' : 'hapi.services.tiller_pb2' +TestReleaseResponse = _reflection.GeneratedProtocolMessageType('TestReleaseResponse', (_message.Message,), dict( + DESCRIPTOR = _TESTRELEASERESPONSE, + __module__ = 'hapi.services.tiller_pb2' # @@protoc_insertion_point(class_scope:hapi.services.tiller.TestReleaseResponse) - }) + )) _sym_db.RegisterMessage(TestReleaseResponse) diff --git a/hapi/version/version_pb2.py b/hapi/version/version_pb2.py index eb30d6a2..04a8df85 100644 --- a/hapi/version/version_pb2.py +++ b/hapi/version/version_pb2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: hapi/version/version.proto @@ -73,11 +72,11 @@ _VERSION = _descriptor.Descriptor( DESCRIPTOR.message_types_by_name['Version'] = _VERSION _sym_db.RegisterFileDescriptor(DESCRIPTOR) -Version = _reflection.GeneratedProtocolMessageType('Version', (_message.Message,), { - 'DESCRIPTOR' : _VERSION, - '__module__' : 'hapi.version.version_pb2' +Version = _reflection.GeneratedProtocolMessageType('Version', (_message.Message,), dict( + DESCRIPTOR = _VERSION, + __module__ = 'hapi.version.version_pb2' # @@protoc_insertion_point(class_scope:hapi.version.Version) - }) + )) _sym_db.RegisterMessage(Version) diff --git a/tools/airship2-integration/000-clone-dependencies.sh b/tools/airship2-integration/000-clone-dependencies.sh index f98306b6..68edc703 100755 --- a/tools/airship2-integration/000-clone-dependencies.sh +++ b/tools/airship2-integration/000-clone-dependencies.sh @@ -18,7 +18,7 @@ set -xe CURRENT_DIR="$(pwd)" : "${INSTALL_PATH:="../"}" cd ${INSTALL_PATH} -: "${OSH_INFRA_COMMIT:="eacf93722136636dcfbd2b68c59b71f071ffc085"}" +: "${OSH_INFRA_COMMIT:="dc58ef9dddd0326cc86229eda4e21e269adb31be"}" # Clone openstack-helm-infra git clone https://opendev.org/openstack/openstack-helm-infra.git diff --git a/tools/helm-hapi.sh b/tools/helm-hapi.sh index 68ad51a0..94bed2cd 100755 --- a/tools/helm-hapi.sh +++ b/tools/helm-hapi.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -HELM_BRANCH='v2.16.1' +HELM_BRANCH='v2.16.9' git clone https://github.com/helm/helm ./helm -b $HELM_BRANCH diff --git a/tools/helm_install.sh b/tools/helm_install.sh index ae77e886..bbef579e 100755 --- a/tools/helm_install.sh +++ b/tools/helm_install.sh @@ -17,7 +17,7 @@ set -x HELM=$1 -HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.16.1-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.16.9-linux-amd64.tar.gz"} function install_helm_binary {