From ab8d33d28a2b5e9a419e0018c9fee82b0134b11e Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 26 Oct 2017 10:11:29 -0700 Subject: [PATCH 01/24] merge master upstream --- pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/const.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/doc.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types_test.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/validate.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/const.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/doc.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types_test.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/validate.go | 0 pkg/{ => armhelpers}/api/apiloader.go | 0 pkg/{ => armhelpers}/api/common/const.go | 0 pkg/{ => armhelpers}/api/common/helper.go | 0 pkg/{ => armhelpers}/api/common/helper_test.go | 0 pkg/{ => armhelpers}/api/common/net.go | 0 pkg/{ => armhelpers}/api/common/net_test.go | 0 pkg/{ => armhelpers}/api/const.go | 0 pkg/{ => armhelpers}/api/converterfromagentpoolonlyapi.go | 0 pkg/{ => armhelpers}/api/converterfromapi.go | 0 pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi.go | 0 pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi_test.go | 0 pkg/{ => armhelpers}/api/convertertoapi.go | 0 pkg/{ => armhelpers}/api/convertertoapi_test.go | 0 pkg/{ => armhelpers}/api/doc.go | 0 pkg/{ => armhelpers}/api/orchestrators.go | 0 pkg/{ => armhelpers}/api/orchestrators_test.go | 0 pkg/{ => armhelpers}/api/strictjson.go | 0 pkg/{ => armhelpers}/api/strictjson_test.go | 0 pkg/{ => armhelpers}/api/types.go | 0 pkg/{ => armhelpers}/api/types_test.go | 0 pkg/{ => armhelpers}/api/v20160330/const.go | 0 pkg/{ => armhelpers}/api/v20160330/doc.go | 0 pkg/{ => armhelpers}/api/v20160330/merge.go | 0 pkg/{ => armhelpers}/api/v20160330/merge_test.go | 0 pkg/{ => armhelpers}/api/v20160330/types.go | 0 pkg/{ => armhelpers}/api/v20160330/types_test.go | 0 pkg/{ => armhelpers}/api/v20160330/validate.go | 0 pkg/{ => armhelpers}/api/v20160930/const.go | 0 pkg/{ => armhelpers}/api/v20160930/doc.go | 0 pkg/{ => armhelpers}/api/v20160930/merge.go | 0 pkg/{ => armhelpers}/api/v20160930/merge_test.go | 0 pkg/{ => armhelpers}/api/v20160930/types.go | 0 pkg/{ => armhelpers}/api/v20160930/types_test.go | 0 pkg/{ => armhelpers}/api/v20160930/validate.go | 0 pkg/{ => armhelpers}/api/v20170131/const.go | 0 pkg/{ => armhelpers}/api/v20170131/doc.go | 0 pkg/{ => armhelpers}/api/v20170131/merge.go | 0 pkg/{ => armhelpers}/api/v20170131/merge_test.go | 0 pkg/{ => armhelpers}/api/v20170131/types.go | 0 pkg/{ => armhelpers}/api/v20170131/types_test.go | 0 pkg/{ => armhelpers}/api/v20170131/validate.go | 0 pkg/{ => armhelpers}/api/v20170131/validate_test.go | 0 pkg/{ => armhelpers}/api/v20170701/const.go | 0 pkg/{ => armhelpers}/api/v20170701/doc.go | 0 pkg/{ => armhelpers}/api/v20170701/merge.go | 0 pkg/{ => armhelpers}/api/v20170701/merge_test.go | 0 pkg/{ => armhelpers}/api/v20170701/types.go | 0 pkg/{ => armhelpers}/api/v20170701/types_test.go | 0 pkg/{ => armhelpers}/api/v20170701/validate.go | 0 pkg/{ => armhelpers}/api/v20170701/validate_test.go | 0 pkg/{ => armhelpers}/api/v20170930/const.go | 0 pkg/{ => armhelpers}/api/v20170930/types.go | 0 pkg/{ => armhelpers}/api/v20170930/validate.go | 0 pkg/{ => armhelpers}/api/vlabs/const.go | 0 pkg/{ => armhelpers}/api/vlabs/doc.go | 0 pkg/{ => armhelpers}/api/vlabs/merge.go | 0 pkg/{ => armhelpers}/api/vlabs/merge_test.go | 0 pkg/{ => armhelpers}/api/vlabs/orchestratorversiontypes.go | 0 pkg/{ => armhelpers}/api/vlabs/types.go | 0 pkg/{ => armhelpers}/api/vlabs/validate.go | 0 pkg/{ => armhelpers}/api/vlabs/validate_test.go | 0 71 files changed, 0 insertions(+), 0 deletions(-) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/const.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/doc.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types_test.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/validate.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/const.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/doc.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types_test.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/validate.go (100%) rename pkg/{ => armhelpers}/api/apiloader.go (100%) rename pkg/{ => armhelpers}/api/common/const.go (100%) rename pkg/{ => armhelpers}/api/common/helper.go (100%) rename pkg/{ => armhelpers}/api/common/helper_test.go (100%) rename pkg/{ => armhelpers}/api/common/net.go (100%) rename pkg/{ => armhelpers}/api/common/net_test.go (100%) rename pkg/{ => armhelpers}/api/const.go (100%) rename pkg/{ => armhelpers}/api/converterfromagentpoolonlyapi.go (100%) rename pkg/{ => armhelpers}/api/converterfromapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi_test.go (100%) rename pkg/{ => armhelpers}/api/convertertoapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoapi_test.go (100%) rename pkg/{ => armhelpers}/api/doc.go (100%) rename pkg/{ => armhelpers}/api/orchestrators.go (100%) rename pkg/{ => armhelpers}/api/orchestrators_test.go (100%) rename pkg/{ => armhelpers}/api/strictjson.go (100%) rename pkg/{ => armhelpers}/api/strictjson_test.go (100%) rename pkg/{ => armhelpers}/api/types.go (100%) rename pkg/{ => armhelpers}/api/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/const.go (100%) rename pkg/{ => armhelpers}/api/v20160330/doc.go (100%) rename pkg/{ => armhelpers}/api/v20160330/merge.go (100%) rename pkg/{ => armhelpers}/api/v20160330/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/types.go (100%) rename pkg/{ => armhelpers}/api/v20160330/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/validate.go (100%) rename pkg/{ => armhelpers}/api/v20160930/const.go (100%) rename pkg/{ => armhelpers}/api/v20160930/doc.go (100%) rename pkg/{ => armhelpers}/api/v20160930/merge.go (100%) rename pkg/{ => armhelpers}/api/v20160930/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20160930/types.go (100%) rename pkg/{ => armhelpers}/api/v20160930/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160930/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170131/const.go (100%) rename pkg/{ => armhelpers}/api/v20170131/doc.go (100%) rename pkg/{ => armhelpers}/api/v20170131/merge.go (100%) rename pkg/{ => armhelpers}/api/v20170131/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20170131/types.go (100%) rename pkg/{ => armhelpers}/api/v20170131/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20170131/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170131/validate_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/const.go (100%) rename pkg/{ => armhelpers}/api/v20170701/doc.go (100%) rename pkg/{ => armhelpers}/api/v20170701/merge.go (100%) rename pkg/{ => armhelpers}/api/v20170701/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/types.go (100%) rename pkg/{ => armhelpers}/api/v20170701/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170701/validate_test.go (100%) rename pkg/{ => armhelpers}/api/v20170930/const.go (100%) rename pkg/{ => armhelpers}/api/v20170930/types.go (100%) rename pkg/{ => armhelpers}/api/v20170930/validate.go (100%) rename pkg/{ => armhelpers}/api/vlabs/const.go (100%) rename pkg/{ => armhelpers}/api/vlabs/doc.go (100%) rename pkg/{ => armhelpers}/api/vlabs/merge.go (100%) rename pkg/{ => armhelpers}/api/vlabs/merge_test.go (100%) rename pkg/{ => armhelpers}/api/vlabs/orchestratorversiontypes.go (100%) rename pkg/{ => armhelpers}/api/vlabs/types.go (100%) rename pkg/{ => armhelpers}/api/vlabs/validate.go (100%) rename pkg/{ => armhelpers}/api/vlabs/validate_test.go (100%) diff --git a/pkg/api/agentPoolOnlyApi/v20170831/const.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/const.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/doc.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/doc.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/types.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/types.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/types_test.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/types_test.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/validate.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/validate.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/const.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/const.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/doc.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/doc.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/types.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/types.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/types_test.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/types_test.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/validate.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/validate.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go diff --git a/pkg/api/apiloader.go b/pkg/armhelpers/api/apiloader.go similarity index 100% rename from pkg/api/apiloader.go rename to pkg/armhelpers/api/apiloader.go diff --git a/pkg/api/common/const.go b/pkg/armhelpers/api/common/const.go similarity index 100% rename from pkg/api/common/const.go rename to pkg/armhelpers/api/common/const.go diff --git a/pkg/api/common/helper.go b/pkg/armhelpers/api/common/helper.go similarity index 100% rename from pkg/api/common/helper.go rename to pkg/armhelpers/api/common/helper.go diff --git a/pkg/api/common/helper_test.go b/pkg/armhelpers/api/common/helper_test.go similarity index 100% rename from pkg/api/common/helper_test.go rename to pkg/armhelpers/api/common/helper_test.go diff --git a/pkg/api/common/net.go b/pkg/armhelpers/api/common/net.go similarity index 100% rename from pkg/api/common/net.go rename to pkg/armhelpers/api/common/net.go diff --git a/pkg/api/common/net_test.go b/pkg/armhelpers/api/common/net_test.go similarity index 100% rename from pkg/api/common/net_test.go rename to pkg/armhelpers/api/common/net_test.go diff --git a/pkg/api/const.go b/pkg/armhelpers/api/const.go similarity index 100% rename from pkg/api/const.go rename to pkg/armhelpers/api/const.go diff --git a/pkg/api/converterfromagentpoolonlyapi.go b/pkg/armhelpers/api/converterfromagentpoolonlyapi.go similarity index 100% rename from pkg/api/converterfromagentpoolonlyapi.go rename to pkg/armhelpers/api/converterfromagentpoolonlyapi.go diff --git a/pkg/api/converterfromapi.go b/pkg/armhelpers/api/converterfromapi.go similarity index 100% rename from pkg/api/converterfromapi.go rename to pkg/armhelpers/api/converterfromapi.go diff --git a/pkg/api/convertertoagentpoolonlyapi.go b/pkg/armhelpers/api/convertertoagentpoolonlyapi.go similarity index 100% rename from pkg/api/convertertoagentpoolonlyapi.go rename to pkg/armhelpers/api/convertertoagentpoolonlyapi.go diff --git a/pkg/api/convertertoagentpoolonlyapi_test.go b/pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go similarity index 100% rename from pkg/api/convertertoagentpoolonlyapi_test.go rename to pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go diff --git a/pkg/api/convertertoapi.go b/pkg/armhelpers/api/convertertoapi.go similarity index 100% rename from pkg/api/convertertoapi.go rename to pkg/armhelpers/api/convertertoapi.go diff --git a/pkg/api/convertertoapi_test.go b/pkg/armhelpers/api/convertertoapi_test.go similarity index 100% rename from pkg/api/convertertoapi_test.go rename to pkg/armhelpers/api/convertertoapi_test.go diff --git a/pkg/api/doc.go b/pkg/armhelpers/api/doc.go similarity index 100% rename from pkg/api/doc.go rename to pkg/armhelpers/api/doc.go diff --git a/pkg/api/orchestrators.go b/pkg/armhelpers/api/orchestrators.go similarity index 100% rename from pkg/api/orchestrators.go rename to pkg/armhelpers/api/orchestrators.go diff --git a/pkg/api/orchestrators_test.go b/pkg/armhelpers/api/orchestrators_test.go similarity index 100% rename from pkg/api/orchestrators_test.go rename to pkg/armhelpers/api/orchestrators_test.go diff --git a/pkg/api/strictjson.go b/pkg/armhelpers/api/strictjson.go similarity index 100% rename from pkg/api/strictjson.go rename to pkg/armhelpers/api/strictjson.go diff --git a/pkg/api/strictjson_test.go b/pkg/armhelpers/api/strictjson_test.go similarity index 100% rename from pkg/api/strictjson_test.go rename to pkg/armhelpers/api/strictjson_test.go diff --git a/pkg/api/types.go b/pkg/armhelpers/api/types.go similarity index 100% rename from pkg/api/types.go rename to pkg/armhelpers/api/types.go diff --git a/pkg/api/types_test.go b/pkg/armhelpers/api/types_test.go similarity index 100% rename from pkg/api/types_test.go rename to pkg/armhelpers/api/types_test.go diff --git a/pkg/api/v20160330/const.go b/pkg/armhelpers/api/v20160330/const.go similarity index 100% rename from pkg/api/v20160330/const.go rename to pkg/armhelpers/api/v20160330/const.go diff --git a/pkg/api/v20160330/doc.go b/pkg/armhelpers/api/v20160330/doc.go similarity index 100% rename from pkg/api/v20160330/doc.go rename to pkg/armhelpers/api/v20160330/doc.go diff --git a/pkg/api/v20160330/merge.go b/pkg/armhelpers/api/v20160330/merge.go similarity index 100% rename from pkg/api/v20160330/merge.go rename to pkg/armhelpers/api/v20160330/merge.go diff --git a/pkg/api/v20160330/merge_test.go b/pkg/armhelpers/api/v20160330/merge_test.go similarity index 100% rename from pkg/api/v20160330/merge_test.go rename to pkg/armhelpers/api/v20160330/merge_test.go diff --git a/pkg/api/v20160330/types.go b/pkg/armhelpers/api/v20160330/types.go similarity index 100% rename from pkg/api/v20160330/types.go rename to pkg/armhelpers/api/v20160330/types.go diff --git a/pkg/api/v20160330/types_test.go b/pkg/armhelpers/api/v20160330/types_test.go similarity index 100% rename from pkg/api/v20160330/types_test.go rename to pkg/armhelpers/api/v20160330/types_test.go diff --git a/pkg/api/v20160330/validate.go b/pkg/armhelpers/api/v20160330/validate.go similarity index 100% rename from pkg/api/v20160330/validate.go rename to pkg/armhelpers/api/v20160330/validate.go diff --git a/pkg/api/v20160930/const.go b/pkg/armhelpers/api/v20160930/const.go similarity index 100% rename from pkg/api/v20160930/const.go rename to pkg/armhelpers/api/v20160930/const.go diff --git a/pkg/api/v20160930/doc.go b/pkg/armhelpers/api/v20160930/doc.go similarity index 100% rename from pkg/api/v20160930/doc.go rename to pkg/armhelpers/api/v20160930/doc.go diff --git a/pkg/api/v20160930/merge.go b/pkg/armhelpers/api/v20160930/merge.go similarity index 100% rename from pkg/api/v20160930/merge.go rename to pkg/armhelpers/api/v20160930/merge.go diff --git a/pkg/api/v20160930/merge_test.go b/pkg/armhelpers/api/v20160930/merge_test.go similarity index 100% rename from pkg/api/v20160930/merge_test.go rename to pkg/armhelpers/api/v20160930/merge_test.go diff --git a/pkg/api/v20160930/types.go b/pkg/armhelpers/api/v20160930/types.go similarity index 100% rename from pkg/api/v20160930/types.go rename to pkg/armhelpers/api/v20160930/types.go diff --git a/pkg/api/v20160930/types_test.go b/pkg/armhelpers/api/v20160930/types_test.go similarity index 100% rename from pkg/api/v20160930/types_test.go rename to pkg/armhelpers/api/v20160930/types_test.go diff --git a/pkg/api/v20160930/validate.go b/pkg/armhelpers/api/v20160930/validate.go similarity index 100% rename from pkg/api/v20160930/validate.go rename to pkg/armhelpers/api/v20160930/validate.go diff --git a/pkg/api/v20170131/const.go b/pkg/armhelpers/api/v20170131/const.go similarity index 100% rename from pkg/api/v20170131/const.go rename to pkg/armhelpers/api/v20170131/const.go diff --git a/pkg/api/v20170131/doc.go b/pkg/armhelpers/api/v20170131/doc.go similarity index 100% rename from pkg/api/v20170131/doc.go rename to pkg/armhelpers/api/v20170131/doc.go diff --git a/pkg/api/v20170131/merge.go b/pkg/armhelpers/api/v20170131/merge.go similarity index 100% rename from pkg/api/v20170131/merge.go rename to pkg/armhelpers/api/v20170131/merge.go diff --git a/pkg/api/v20170131/merge_test.go b/pkg/armhelpers/api/v20170131/merge_test.go similarity index 100% rename from pkg/api/v20170131/merge_test.go rename to pkg/armhelpers/api/v20170131/merge_test.go diff --git a/pkg/api/v20170131/types.go b/pkg/armhelpers/api/v20170131/types.go similarity index 100% rename from pkg/api/v20170131/types.go rename to pkg/armhelpers/api/v20170131/types.go diff --git a/pkg/api/v20170131/types_test.go b/pkg/armhelpers/api/v20170131/types_test.go similarity index 100% rename from pkg/api/v20170131/types_test.go rename to pkg/armhelpers/api/v20170131/types_test.go diff --git a/pkg/api/v20170131/validate.go b/pkg/armhelpers/api/v20170131/validate.go similarity index 100% rename from pkg/api/v20170131/validate.go rename to pkg/armhelpers/api/v20170131/validate.go diff --git a/pkg/api/v20170131/validate_test.go b/pkg/armhelpers/api/v20170131/validate_test.go similarity index 100% rename from pkg/api/v20170131/validate_test.go rename to pkg/armhelpers/api/v20170131/validate_test.go diff --git a/pkg/api/v20170701/const.go b/pkg/armhelpers/api/v20170701/const.go similarity index 100% rename from pkg/api/v20170701/const.go rename to pkg/armhelpers/api/v20170701/const.go diff --git a/pkg/api/v20170701/doc.go b/pkg/armhelpers/api/v20170701/doc.go similarity index 100% rename from pkg/api/v20170701/doc.go rename to pkg/armhelpers/api/v20170701/doc.go diff --git a/pkg/api/v20170701/merge.go b/pkg/armhelpers/api/v20170701/merge.go similarity index 100% rename from pkg/api/v20170701/merge.go rename to pkg/armhelpers/api/v20170701/merge.go diff --git a/pkg/api/v20170701/merge_test.go b/pkg/armhelpers/api/v20170701/merge_test.go similarity index 100% rename from pkg/api/v20170701/merge_test.go rename to pkg/armhelpers/api/v20170701/merge_test.go diff --git a/pkg/api/v20170701/types.go b/pkg/armhelpers/api/v20170701/types.go similarity index 100% rename from pkg/api/v20170701/types.go rename to pkg/armhelpers/api/v20170701/types.go diff --git a/pkg/api/v20170701/types_test.go b/pkg/armhelpers/api/v20170701/types_test.go similarity index 100% rename from pkg/api/v20170701/types_test.go rename to pkg/armhelpers/api/v20170701/types_test.go diff --git a/pkg/api/v20170701/validate.go b/pkg/armhelpers/api/v20170701/validate.go similarity index 100% rename from pkg/api/v20170701/validate.go rename to pkg/armhelpers/api/v20170701/validate.go diff --git a/pkg/api/v20170701/validate_test.go b/pkg/armhelpers/api/v20170701/validate_test.go similarity index 100% rename from pkg/api/v20170701/validate_test.go rename to pkg/armhelpers/api/v20170701/validate_test.go diff --git a/pkg/api/v20170930/const.go b/pkg/armhelpers/api/v20170930/const.go similarity index 100% rename from pkg/api/v20170930/const.go rename to pkg/armhelpers/api/v20170930/const.go diff --git a/pkg/api/v20170930/types.go b/pkg/armhelpers/api/v20170930/types.go similarity index 100% rename from pkg/api/v20170930/types.go rename to pkg/armhelpers/api/v20170930/types.go diff --git a/pkg/api/v20170930/validate.go b/pkg/armhelpers/api/v20170930/validate.go similarity index 100% rename from pkg/api/v20170930/validate.go rename to pkg/armhelpers/api/v20170930/validate.go diff --git a/pkg/api/vlabs/const.go b/pkg/armhelpers/api/vlabs/const.go similarity index 100% rename from pkg/api/vlabs/const.go rename to pkg/armhelpers/api/vlabs/const.go diff --git a/pkg/api/vlabs/doc.go b/pkg/armhelpers/api/vlabs/doc.go similarity index 100% rename from pkg/api/vlabs/doc.go rename to pkg/armhelpers/api/vlabs/doc.go diff --git a/pkg/api/vlabs/merge.go b/pkg/armhelpers/api/vlabs/merge.go similarity index 100% rename from pkg/api/vlabs/merge.go rename to pkg/armhelpers/api/vlabs/merge.go diff --git a/pkg/api/vlabs/merge_test.go b/pkg/armhelpers/api/vlabs/merge_test.go similarity index 100% rename from pkg/api/vlabs/merge_test.go rename to pkg/armhelpers/api/vlabs/merge_test.go diff --git a/pkg/api/vlabs/orchestratorversiontypes.go b/pkg/armhelpers/api/vlabs/orchestratorversiontypes.go similarity index 100% rename from pkg/api/vlabs/orchestratorversiontypes.go rename to pkg/armhelpers/api/vlabs/orchestratorversiontypes.go diff --git a/pkg/api/vlabs/types.go b/pkg/armhelpers/api/vlabs/types.go similarity index 100% rename from pkg/api/vlabs/types.go rename to pkg/armhelpers/api/vlabs/types.go diff --git a/pkg/api/vlabs/validate.go b/pkg/armhelpers/api/vlabs/validate.go similarity index 100% rename from pkg/api/vlabs/validate.go rename to pkg/armhelpers/api/vlabs/validate.go diff --git a/pkg/api/vlabs/validate_test.go b/pkg/armhelpers/api/vlabs/validate_test.go similarity index 100% rename from pkg/api/vlabs/validate_test.go rename to pkg/armhelpers/api/vlabs/validate_test.go From dca734df3e374fd345700dc16e83a2c058527874 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 26 Oct 2017 10:14:20 -0700 Subject: [PATCH 02/24] Revert "merge master upstream" This reverts commit ab8d33d28a2b5e9a419e0018c9fee82b0134b11e. --- pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/const.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/doc.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types_test.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/validate.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/const.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/doc.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types_test.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/validate.go | 0 pkg/{armhelpers => }/api/apiloader.go | 0 pkg/{armhelpers => }/api/common/const.go | 0 pkg/{armhelpers => }/api/common/helper.go | 0 pkg/{armhelpers => }/api/common/helper_test.go | 0 pkg/{armhelpers => }/api/common/net.go | 0 pkg/{armhelpers => }/api/common/net_test.go | 0 pkg/{armhelpers => }/api/const.go | 0 pkg/{armhelpers => }/api/converterfromagentpoolonlyapi.go | 0 pkg/{armhelpers => }/api/converterfromapi.go | 0 pkg/{armhelpers => }/api/convertertoagentpoolonlyapi.go | 0 pkg/{armhelpers => }/api/convertertoagentpoolonlyapi_test.go | 0 pkg/{armhelpers => }/api/convertertoapi.go | 0 pkg/{armhelpers => }/api/convertertoapi_test.go | 0 pkg/{armhelpers => }/api/doc.go | 0 pkg/{armhelpers => }/api/orchestrators.go | 0 pkg/{armhelpers => }/api/orchestrators_test.go | 0 pkg/{armhelpers => }/api/strictjson.go | 0 pkg/{armhelpers => }/api/strictjson_test.go | 0 pkg/{armhelpers => }/api/types.go | 0 pkg/{armhelpers => }/api/types_test.go | 0 pkg/{armhelpers => }/api/v20160330/const.go | 0 pkg/{armhelpers => }/api/v20160330/doc.go | 0 pkg/{armhelpers => }/api/v20160330/merge.go | 0 pkg/{armhelpers => }/api/v20160330/merge_test.go | 0 pkg/{armhelpers => }/api/v20160330/types.go | 0 pkg/{armhelpers => }/api/v20160330/types_test.go | 0 pkg/{armhelpers => }/api/v20160330/validate.go | 0 pkg/{armhelpers => }/api/v20160930/const.go | 0 pkg/{armhelpers => }/api/v20160930/doc.go | 0 pkg/{armhelpers => }/api/v20160930/merge.go | 0 pkg/{armhelpers => }/api/v20160930/merge_test.go | 0 pkg/{armhelpers => }/api/v20160930/types.go | 0 pkg/{armhelpers => }/api/v20160930/types_test.go | 0 pkg/{armhelpers => }/api/v20160930/validate.go | 0 pkg/{armhelpers => }/api/v20170131/const.go | 0 pkg/{armhelpers => }/api/v20170131/doc.go | 0 pkg/{armhelpers => }/api/v20170131/merge.go | 0 pkg/{armhelpers => }/api/v20170131/merge_test.go | 0 pkg/{armhelpers => }/api/v20170131/types.go | 0 pkg/{armhelpers => }/api/v20170131/types_test.go | 0 pkg/{armhelpers => }/api/v20170131/validate.go | 0 pkg/{armhelpers => }/api/v20170131/validate_test.go | 0 pkg/{armhelpers => }/api/v20170701/const.go | 0 pkg/{armhelpers => }/api/v20170701/doc.go | 0 pkg/{armhelpers => }/api/v20170701/merge.go | 0 pkg/{armhelpers => }/api/v20170701/merge_test.go | 0 pkg/{armhelpers => }/api/v20170701/types.go | 0 pkg/{armhelpers => }/api/v20170701/types_test.go | 0 pkg/{armhelpers => }/api/v20170701/validate.go | 0 pkg/{armhelpers => }/api/v20170701/validate_test.go | 0 pkg/{armhelpers => }/api/v20170930/const.go | 0 pkg/{armhelpers => }/api/v20170930/types.go | 0 pkg/{armhelpers => }/api/v20170930/validate.go | 0 pkg/{armhelpers => }/api/vlabs/const.go | 0 pkg/{armhelpers => }/api/vlabs/doc.go | 0 pkg/{armhelpers => }/api/vlabs/merge.go | 0 pkg/{armhelpers => }/api/vlabs/merge_test.go | 0 pkg/{armhelpers => }/api/vlabs/orchestratorversiontypes.go | 0 pkg/{armhelpers => }/api/vlabs/types.go | 0 pkg/{armhelpers => }/api/vlabs/validate.go | 0 pkg/{armhelpers => }/api/vlabs/validate_test.go | 0 71 files changed, 0 insertions(+), 0 deletions(-) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/const.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/doc.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types_test.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/validate.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/const.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/doc.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types_test.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/validate.go (100%) rename pkg/{armhelpers => }/api/apiloader.go (100%) rename pkg/{armhelpers => }/api/common/const.go (100%) rename pkg/{armhelpers => }/api/common/helper.go (100%) rename pkg/{armhelpers => }/api/common/helper_test.go (100%) rename pkg/{armhelpers => }/api/common/net.go (100%) rename pkg/{armhelpers => }/api/common/net_test.go (100%) rename pkg/{armhelpers => }/api/const.go (100%) rename pkg/{armhelpers => }/api/converterfromagentpoolonlyapi.go (100%) rename pkg/{armhelpers => }/api/converterfromapi.go (100%) rename pkg/{armhelpers => }/api/convertertoagentpoolonlyapi.go (100%) rename pkg/{armhelpers => }/api/convertertoagentpoolonlyapi_test.go (100%) rename pkg/{armhelpers => }/api/convertertoapi.go (100%) rename pkg/{armhelpers => }/api/convertertoapi_test.go (100%) rename pkg/{armhelpers => }/api/doc.go (100%) rename pkg/{armhelpers => }/api/orchestrators.go (100%) rename pkg/{armhelpers => }/api/orchestrators_test.go (100%) rename pkg/{armhelpers => }/api/strictjson.go (100%) rename pkg/{armhelpers => }/api/strictjson_test.go (100%) rename pkg/{armhelpers => }/api/types.go (100%) rename pkg/{armhelpers => }/api/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/const.go (100%) rename pkg/{armhelpers => }/api/v20160330/doc.go (100%) rename pkg/{armhelpers => }/api/v20160330/merge.go (100%) rename pkg/{armhelpers => }/api/v20160330/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/types.go (100%) rename pkg/{armhelpers => }/api/v20160330/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/validate.go (100%) rename pkg/{armhelpers => }/api/v20160930/const.go (100%) rename pkg/{armhelpers => }/api/v20160930/doc.go (100%) rename pkg/{armhelpers => }/api/v20160930/merge.go (100%) rename pkg/{armhelpers => }/api/v20160930/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20160930/types.go (100%) rename pkg/{armhelpers => }/api/v20160930/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160930/validate.go (100%) rename pkg/{armhelpers => }/api/v20170131/const.go (100%) rename pkg/{armhelpers => }/api/v20170131/doc.go (100%) rename pkg/{armhelpers => }/api/v20170131/merge.go (100%) rename pkg/{armhelpers => }/api/v20170131/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20170131/types.go (100%) rename pkg/{armhelpers => }/api/v20170131/types_test.go (100%) rename pkg/{armhelpers => }/api/v20170131/validate.go (100%) rename pkg/{armhelpers => }/api/v20170131/validate_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/const.go (100%) rename pkg/{armhelpers => }/api/v20170701/doc.go (100%) rename pkg/{armhelpers => }/api/v20170701/merge.go (100%) rename pkg/{armhelpers => }/api/v20170701/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/types.go (100%) rename pkg/{armhelpers => }/api/v20170701/types_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/validate.go (100%) rename pkg/{armhelpers => }/api/v20170701/validate_test.go (100%) rename pkg/{armhelpers => }/api/v20170930/const.go (100%) rename pkg/{armhelpers => }/api/v20170930/types.go (100%) rename pkg/{armhelpers => }/api/v20170930/validate.go (100%) rename pkg/{armhelpers => }/api/vlabs/const.go (100%) rename pkg/{armhelpers => }/api/vlabs/doc.go (100%) rename pkg/{armhelpers => }/api/vlabs/merge.go (100%) rename pkg/{armhelpers => }/api/vlabs/merge_test.go (100%) rename pkg/{armhelpers => }/api/vlabs/orchestratorversiontypes.go (100%) rename pkg/{armhelpers => }/api/vlabs/types.go (100%) rename pkg/{armhelpers => }/api/vlabs/validate.go (100%) rename pkg/{armhelpers => }/api/vlabs/validate_test.go (100%) diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go b/pkg/api/agentPoolOnlyApi/v20170831/const.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go rename to pkg/api/agentPoolOnlyApi/v20170831/const.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go b/pkg/api/agentPoolOnlyApi/v20170831/doc.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go rename to pkg/api/agentPoolOnlyApi/v20170831/doc.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go b/pkg/api/agentPoolOnlyApi/v20170831/types.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go rename to pkg/api/agentPoolOnlyApi/v20170831/types.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go b/pkg/api/agentPoolOnlyApi/v20170831/types_test.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go rename to pkg/api/agentPoolOnlyApi/v20170831/types_test.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go b/pkg/api/agentPoolOnlyApi/v20170831/validate.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go rename to pkg/api/agentPoolOnlyApi/v20170831/validate.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go b/pkg/api/agentPoolOnlyApi/vlabs/const.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go rename to pkg/api/agentPoolOnlyApi/vlabs/const.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go b/pkg/api/agentPoolOnlyApi/vlabs/doc.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go rename to pkg/api/agentPoolOnlyApi/vlabs/doc.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go b/pkg/api/agentPoolOnlyApi/vlabs/types.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go rename to pkg/api/agentPoolOnlyApi/vlabs/types.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go b/pkg/api/agentPoolOnlyApi/vlabs/types_test.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go rename to pkg/api/agentPoolOnlyApi/vlabs/types_test.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go b/pkg/api/agentPoolOnlyApi/vlabs/validate.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go rename to pkg/api/agentPoolOnlyApi/vlabs/validate.go diff --git a/pkg/armhelpers/api/apiloader.go b/pkg/api/apiloader.go similarity index 100% rename from pkg/armhelpers/api/apiloader.go rename to pkg/api/apiloader.go diff --git a/pkg/armhelpers/api/common/const.go b/pkg/api/common/const.go similarity index 100% rename from pkg/armhelpers/api/common/const.go rename to pkg/api/common/const.go diff --git a/pkg/armhelpers/api/common/helper.go b/pkg/api/common/helper.go similarity index 100% rename from pkg/armhelpers/api/common/helper.go rename to pkg/api/common/helper.go diff --git a/pkg/armhelpers/api/common/helper_test.go b/pkg/api/common/helper_test.go similarity index 100% rename from pkg/armhelpers/api/common/helper_test.go rename to pkg/api/common/helper_test.go diff --git a/pkg/armhelpers/api/common/net.go b/pkg/api/common/net.go similarity index 100% rename from pkg/armhelpers/api/common/net.go rename to pkg/api/common/net.go diff --git a/pkg/armhelpers/api/common/net_test.go b/pkg/api/common/net_test.go similarity index 100% rename from pkg/armhelpers/api/common/net_test.go rename to pkg/api/common/net_test.go diff --git a/pkg/armhelpers/api/const.go b/pkg/api/const.go similarity index 100% rename from pkg/armhelpers/api/const.go rename to pkg/api/const.go diff --git a/pkg/armhelpers/api/converterfromagentpoolonlyapi.go b/pkg/api/converterfromagentpoolonlyapi.go similarity index 100% rename from pkg/armhelpers/api/converterfromagentpoolonlyapi.go rename to pkg/api/converterfromagentpoolonlyapi.go diff --git a/pkg/armhelpers/api/converterfromapi.go b/pkg/api/converterfromapi.go similarity index 100% rename from pkg/armhelpers/api/converterfromapi.go rename to pkg/api/converterfromapi.go diff --git a/pkg/armhelpers/api/convertertoagentpoolonlyapi.go b/pkg/api/convertertoagentpoolonlyapi.go similarity index 100% rename from pkg/armhelpers/api/convertertoagentpoolonlyapi.go rename to pkg/api/convertertoagentpoolonlyapi.go diff --git a/pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go b/pkg/api/convertertoagentpoolonlyapi_test.go similarity index 100% rename from pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go rename to pkg/api/convertertoagentpoolonlyapi_test.go diff --git a/pkg/armhelpers/api/convertertoapi.go b/pkg/api/convertertoapi.go similarity index 100% rename from pkg/armhelpers/api/convertertoapi.go rename to pkg/api/convertertoapi.go diff --git a/pkg/armhelpers/api/convertertoapi_test.go b/pkg/api/convertertoapi_test.go similarity index 100% rename from pkg/armhelpers/api/convertertoapi_test.go rename to pkg/api/convertertoapi_test.go diff --git a/pkg/armhelpers/api/doc.go b/pkg/api/doc.go similarity index 100% rename from pkg/armhelpers/api/doc.go rename to pkg/api/doc.go diff --git a/pkg/armhelpers/api/orchestrators.go b/pkg/api/orchestrators.go similarity index 100% rename from pkg/armhelpers/api/orchestrators.go rename to pkg/api/orchestrators.go diff --git a/pkg/armhelpers/api/orchestrators_test.go b/pkg/api/orchestrators_test.go similarity index 100% rename from pkg/armhelpers/api/orchestrators_test.go rename to pkg/api/orchestrators_test.go diff --git a/pkg/armhelpers/api/strictjson.go b/pkg/api/strictjson.go similarity index 100% rename from pkg/armhelpers/api/strictjson.go rename to pkg/api/strictjson.go diff --git a/pkg/armhelpers/api/strictjson_test.go b/pkg/api/strictjson_test.go similarity index 100% rename from pkg/armhelpers/api/strictjson_test.go rename to pkg/api/strictjson_test.go diff --git a/pkg/armhelpers/api/types.go b/pkg/api/types.go similarity index 100% rename from pkg/armhelpers/api/types.go rename to pkg/api/types.go diff --git a/pkg/armhelpers/api/types_test.go b/pkg/api/types_test.go similarity index 100% rename from pkg/armhelpers/api/types_test.go rename to pkg/api/types_test.go diff --git a/pkg/armhelpers/api/v20160330/const.go b/pkg/api/v20160330/const.go similarity index 100% rename from pkg/armhelpers/api/v20160330/const.go rename to pkg/api/v20160330/const.go diff --git a/pkg/armhelpers/api/v20160330/doc.go b/pkg/api/v20160330/doc.go similarity index 100% rename from pkg/armhelpers/api/v20160330/doc.go rename to pkg/api/v20160330/doc.go diff --git a/pkg/armhelpers/api/v20160330/merge.go b/pkg/api/v20160330/merge.go similarity index 100% rename from pkg/armhelpers/api/v20160330/merge.go rename to pkg/api/v20160330/merge.go diff --git a/pkg/armhelpers/api/v20160330/merge_test.go b/pkg/api/v20160330/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20160330/merge_test.go rename to pkg/api/v20160330/merge_test.go diff --git a/pkg/armhelpers/api/v20160330/types.go b/pkg/api/v20160330/types.go similarity index 100% rename from pkg/armhelpers/api/v20160330/types.go rename to pkg/api/v20160330/types.go diff --git a/pkg/armhelpers/api/v20160330/types_test.go b/pkg/api/v20160330/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20160330/types_test.go rename to pkg/api/v20160330/types_test.go diff --git a/pkg/armhelpers/api/v20160330/validate.go b/pkg/api/v20160330/validate.go similarity index 100% rename from pkg/armhelpers/api/v20160330/validate.go rename to pkg/api/v20160330/validate.go diff --git a/pkg/armhelpers/api/v20160930/const.go b/pkg/api/v20160930/const.go similarity index 100% rename from pkg/armhelpers/api/v20160930/const.go rename to pkg/api/v20160930/const.go diff --git a/pkg/armhelpers/api/v20160930/doc.go b/pkg/api/v20160930/doc.go similarity index 100% rename from pkg/armhelpers/api/v20160930/doc.go rename to pkg/api/v20160930/doc.go diff --git a/pkg/armhelpers/api/v20160930/merge.go b/pkg/api/v20160930/merge.go similarity index 100% rename from pkg/armhelpers/api/v20160930/merge.go rename to pkg/api/v20160930/merge.go diff --git a/pkg/armhelpers/api/v20160930/merge_test.go b/pkg/api/v20160930/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20160930/merge_test.go rename to pkg/api/v20160930/merge_test.go diff --git a/pkg/armhelpers/api/v20160930/types.go b/pkg/api/v20160930/types.go similarity index 100% rename from pkg/armhelpers/api/v20160930/types.go rename to pkg/api/v20160930/types.go diff --git a/pkg/armhelpers/api/v20160930/types_test.go b/pkg/api/v20160930/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20160930/types_test.go rename to pkg/api/v20160930/types_test.go diff --git a/pkg/armhelpers/api/v20160930/validate.go b/pkg/api/v20160930/validate.go similarity index 100% rename from pkg/armhelpers/api/v20160930/validate.go rename to pkg/api/v20160930/validate.go diff --git a/pkg/armhelpers/api/v20170131/const.go b/pkg/api/v20170131/const.go similarity index 100% rename from pkg/armhelpers/api/v20170131/const.go rename to pkg/api/v20170131/const.go diff --git a/pkg/armhelpers/api/v20170131/doc.go b/pkg/api/v20170131/doc.go similarity index 100% rename from pkg/armhelpers/api/v20170131/doc.go rename to pkg/api/v20170131/doc.go diff --git a/pkg/armhelpers/api/v20170131/merge.go b/pkg/api/v20170131/merge.go similarity index 100% rename from pkg/armhelpers/api/v20170131/merge.go rename to pkg/api/v20170131/merge.go diff --git a/pkg/armhelpers/api/v20170131/merge_test.go b/pkg/api/v20170131/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/merge_test.go rename to pkg/api/v20170131/merge_test.go diff --git a/pkg/armhelpers/api/v20170131/types.go b/pkg/api/v20170131/types.go similarity index 100% rename from pkg/armhelpers/api/v20170131/types.go rename to pkg/api/v20170131/types.go diff --git a/pkg/armhelpers/api/v20170131/types_test.go b/pkg/api/v20170131/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/types_test.go rename to pkg/api/v20170131/types_test.go diff --git a/pkg/armhelpers/api/v20170131/validate.go b/pkg/api/v20170131/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170131/validate.go rename to pkg/api/v20170131/validate.go diff --git a/pkg/armhelpers/api/v20170131/validate_test.go b/pkg/api/v20170131/validate_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/validate_test.go rename to pkg/api/v20170131/validate_test.go diff --git a/pkg/armhelpers/api/v20170701/const.go b/pkg/api/v20170701/const.go similarity index 100% rename from pkg/armhelpers/api/v20170701/const.go rename to pkg/api/v20170701/const.go diff --git a/pkg/armhelpers/api/v20170701/doc.go b/pkg/api/v20170701/doc.go similarity index 100% rename from pkg/armhelpers/api/v20170701/doc.go rename to pkg/api/v20170701/doc.go diff --git a/pkg/armhelpers/api/v20170701/merge.go b/pkg/api/v20170701/merge.go similarity index 100% rename from pkg/armhelpers/api/v20170701/merge.go rename to pkg/api/v20170701/merge.go diff --git a/pkg/armhelpers/api/v20170701/merge_test.go b/pkg/api/v20170701/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/merge_test.go rename to pkg/api/v20170701/merge_test.go diff --git a/pkg/armhelpers/api/v20170701/types.go b/pkg/api/v20170701/types.go similarity index 100% rename from pkg/armhelpers/api/v20170701/types.go rename to pkg/api/v20170701/types.go diff --git a/pkg/armhelpers/api/v20170701/types_test.go b/pkg/api/v20170701/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/types_test.go rename to pkg/api/v20170701/types_test.go diff --git a/pkg/armhelpers/api/v20170701/validate.go b/pkg/api/v20170701/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170701/validate.go rename to pkg/api/v20170701/validate.go diff --git a/pkg/armhelpers/api/v20170701/validate_test.go b/pkg/api/v20170701/validate_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/validate_test.go rename to pkg/api/v20170701/validate_test.go diff --git a/pkg/armhelpers/api/v20170930/const.go b/pkg/api/v20170930/const.go similarity index 100% rename from pkg/armhelpers/api/v20170930/const.go rename to pkg/api/v20170930/const.go diff --git a/pkg/armhelpers/api/v20170930/types.go b/pkg/api/v20170930/types.go similarity index 100% rename from pkg/armhelpers/api/v20170930/types.go rename to pkg/api/v20170930/types.go diff --git a/pkg/armhelpers/api/v20170930/validate.go b/pkg/api/v20170930/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170930/validate.go rename to pkg/api/v20170930/validate.go diff --git a/pkg/armhelpers/api/vlabs/const.go b/pkg/api/vlabs/const.go similarity index 100% rename from pkg/armhelpers/api/vlabs/const.go rename to pkg/api/vlabs/const.go diff --git a/pkg/armhelpers/api/vlabs/doc.go b/pkg/api/vlabs/doc.go similarity index 100% rename from pkg/armhelpers/api/vlabs/doc.go rename to pkg/api/vlabs/doc.go diff --git a/pkg/armhelpers/api/vlabs/merge.go b/pkg/api/vlabs/merge.go similarity index 100% rename from pkg/armhelpers/api/vlabs/merge.go rename to pkg/api/vlabs/merge.go diff --git a/pkg/armhelpers/api/vlabs/merge_test.go b/pkg/api/vlabs/merge_test.go similarity index 100% rename from pkg/armhelpers/api/vlabs/merge_test.go rename to pkg/api/vlabs/merge_test.go diff --git a/pkg/armhelpers/api/vlabs/orchestratorversiontypes.go b/pkg/api/vlabs/orchestratorversiontypes.go similarity index 100% rename from pkg/armhelpers/api/vlabs/orchestratorversiontypes.go rename to pkg/api/vlabs/orchestratorversiontypes.go diff --git a/pkg/armhelpers/api/vlabs/types.go b/pkg/api/vlabs/types.go similarity index 100% rename from pkg/armhelpers/api/vlabs/types.go rename to pkg/api/vlabs/types.go diff --git a/pkg/armhelpers/api/vlabs/validate.go b/pkg/api/vlabs/validate.go similarity index 100% rename from pkg/armhelpers/api/vlabs/validate.go rename to pkg/api/vlabs/validate.go diff --git a/pkg/armhelpers/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go similarity index 100% rename from pkg/armhelpers/api/vlabs/validate_test.go rename to pkg/api/vlabs/validate_test.go From 02de386158b480d5918427b0317990d4b5973670 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 26 Oct 2017 10:11:29 -0700 Subject: [PATCH 03/24] merge master upstream --- pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/const.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/doc.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types_test.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/validate.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/const.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/doc.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types_test.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/validate.go | 0 pkg/{ => armhelpers}/api/apiloader.go | 0 pkg/{ => armhelpers}/api/common/const.go | 0 pkg/{ => armhelpers}/api/common/helper.go | 0 pkg/{ => armhelpers}/api/common/helper_test.go | 0 pkg/{ => armhelpers}/api/common/net.go | 0 pkg/{ => armhelpers}/api/common/net_test.go | 0 pkg/{ => armhelpers}/api/const.go | 0 pkg/{ => armhelpers}/api/converterfromagentpoolonlyapi.go | 0 pkg/{ => armhelpers}/api/converterfromapi.go | 0 pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi.go | 0 pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi_test.go | 0 pkg/{ => armhelpers}/api/convertertoapi.go | 0 pkg/{ => armhelpers}/api/convertertoapi_test.go | 0 pkg/{ => armhelpers}/api/doc.go | 0 pkg/{ => armhelpers}/api/orchestrators.go | 0 pkg/{ => armhelpers}/api/orchestrators_test.go | 0 pkg/{ => armhelpers}/api/strictjson.go | 0 pkg/{ => armhelpers}/api/strictjson_test.go | 0 pkg/{ => armhelpers}/api/types.go | 0 pkg/{ => armhelpers}/api/types_test.go | 0 pkg/{ => armhelpers}/api/v20160330/const.go | 0 pkg/{ => armhelpers}/api/v20160330/doc.go | 0 pkg/{ => armhelpers}/api/v20160330/merge.go | 0 pkg/{ => armhelpers}/api/v20160330/merge_test.go | 0 pkg/{ => armhelpers}/api/v20160330/types.go | 0 pkg/{ => armhelpers}/api/v20160330/types_test.go | 0 pkg/{ => armhelpers}/api/v20160330/validate.go | 0 pkg/{ => armhelpers}/api/v20160930/const.go | 0 pkg/{ => armhelpers}/api/v20160930/doc.go | 0 pkg/{ => armhelpers}/api/v20160930/merge.go | 0 pkg/{ => armhelpers}/api/v20160930/merge_test.go | 0 pkg/{ => armhelpers}/api/v20160930/types.go | 0 pkg/{ => armhelpers}/api/v20160930/types_test.go | 0 pkg/{ => armhelpers}/api/v20160930/validate.go | 0 pkg/{ => armhelpers}/api/v20170131/const.go | 0 pkg/{ => armhelpers}/api/v20170131/doc.go | 0 pkg/{ => armhelpers}/api/v20170131/merge.go | 0 pkg/{ => armhelpers}/api/v20170131/merge_test.go | 0 pkg/{ => armhelpers}/api/v20170131/types.go | 0 pkg/{ => armhelpers}/api/v20170131/types_test.go | 0 pkg/{ => armhelpers}/api/v20170131/validate.go | 0 pkg/{ => armhelpers}/api/v20170131/validate_test.go | 0 pkg/{ => armhelpers}/api/v20170701/const.go | 0 pkg/{ => armhelpers}/api/v20170701/doc.go | 0 pkg/{ => armhelpers}/api/v20170701/merge.go | 0 pkg/{ => armhelpers}/api/v20170701/merge_test.go | 0 pkg/{ => armhelpers}/api/v20170701/types.go | 0 pkg/{ => armhelpers}/api/v20170701/types_test.go | 0 pkg/{ => armhelpers}/api/v20170701/validate.go | 0 pkg/{ => armhelpers}/api/v20170701/validate_test.go | 0 pkg/{ => armhelpers}/api/v20170930/const.go | 0 pkg/{ => armhelpers}/api/v20170930/types.go | 0 pkg/{ => armhelpers}/api/v20170930/validate.go | 0 pkg/{ => armhelpers}/api/vlabs/const.go | 0 pkg/{ => armhelpers}/api/vlabs/doc.go | 0 pkg/{ => armhelpers}/api/vlabs/merge.go | 0 pkg/{ => armhelpers}/api/vlabs/merge_test.go | 0 pkg/{ => armhelpers}/api/vlabs/orchestratorversiontypes.go | 0 pkg/{ => armhelpers}/api/vlabs/types.go | 0 pkg/{ => armhelpers}/api/vlabs/validate.go | 0 pkg/{ => armhelpers}/api/vlabs/validate_test.go | 0 71 files changed, 0 insertions(+), 0 deletions(-) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/const.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/doc.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types_test.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/validate.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/const.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/doc.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types_test.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/validate.go (100%) rename pkg/{ => armhelpers}/api/apiloader.go (100%) rename pkg/{ => armhelpers}/api/common/const.go (100%) rename pkg/{ => armhelpers}/api/common/helper.go (100%) rename pkg/{ => armhelpers}/api/common/helper_test.go (100%) rename pkg/{ => armhelpers}/api/common/net.go (100%) rename pkg/{ => armhelpers}/api/common/net_test.go (100%) rename pkg/{ => armhelpers}/api/const.go (100%) rename pkg/{ => armhelpers}/api/converterfromagentpoolonlyapi.go (100%) rename pkg/{ => armhelpers}/api/converterfromapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi_test.go (100%) rename pkg/{ => armhelpers}/api/convertertoapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoapi_test.go (100%) rename pkg/{ => armhelpers}/api/doc.go (100%) rename pkg/{ => armhelpers}/api/orchestrators.go (100%) rename pkg/{ => armhelpers}/api/orchestrators_test.go (100%) rename pkg/{ => armhelpers}/api/strictjson.go (100%) rename pkg/{ => armhelpers}/api/strictjson_test.go (100%) rename pkg/{ => armhelpers}/api/types.go (100%) rename pkg/{ => armhelpers}/api/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/const.go (100%) rename pkg/{ => armhelpers}/api/v20160330/doc.go (100%) rename pkg/{ => armhelpers}/api/v20160330/merge.go (100%) rename pkg/{ => armhelpers}/api/v20160330/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/types.go (100%) rename pkg/{ => armhelpers}/api/v20160330/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/validate.go (100%) rename pkg/{ => armhelpers}/api/v20160930/const.go (100%) rename pkg/{ => armhelpers}/api/v20160930/doc.go (100%) rename pkg/{ => armhelpers}/api/v20160930/merge.go (100%) rename pkg/{ => armhelpers}/api/v20160930/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20160930/types.go (100%) rename pkg/{ => armhelpers}/api/v20160930/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160930/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170131/const.go (100%) rename pkg/{ => armhelpers}/api/v20170131/doc.go (100%) rename pkg/{ => armhelpers}/api/v20170131/merge.go (100%) rename pkg/{ => armhelpers}/api/v20170131/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20170131/types.go (100%) rename pkg/{ => armhelpers}/api/v20170131/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20170131/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170131/validate_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/const.go (100%) rename pkg/{ => armhelpers}/api/v20170701/doc.go (100%) rename pkg/{ => armhelpers}/api/v20170701/merge.go (100%) rename pkg/{ => armhelpers}/api/v20170701/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/types.go (100%) rename pkg/{ => armhelpers}/api/v20170701/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170701/validate_test.go (100%) rename pkg/{ => armhelpers}/api/v20170930/const.go (100%) rename pkg/{ => armhelpers}/api/v20170930/types.go (100%) rename pkg/{ => armhelpers}/api/v20170930/validate.go (100%) rename pkg/{ => armhelpers}/api/vlabs/const.go (100%) rename pkg/{ => armhelpers}/api/vlabs/doc.go (100%) rename pkg/{ => armhelpers}/api/vlabs/merge.go (100%) rename pkg/{ => armhelpers}/api/vlabs/merge_test.go (100%) rename pkg/{ => armhelpers}/api/vlabs/orchestratorversiontypes.go (100%) rename pkg/{ => armhelpers}/api/vlabs/types.go (100%) rename pkg/{ => armhelpers}/api/vlabs/validate.go (100%) rename pkg/{ => armhelpers}/api/vlabs/validate_test.go (100%) diff --git a/pkg/api/agentPoolOnlyApi/v20170831/const.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/const.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/doc.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/doc.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/types.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/types.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/types_test.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/types_test.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/validate.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/validate.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/const.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/const.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/doc.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/doc.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/types.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/types.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/types_test.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/types_test.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/validate.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/validate.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go diff --git a/pkg/api/apiloader.go b/pkg/armhelpers/api/apiloader.go similarity index 100% rename from pkg/api/apiloader.go rename to pkg/armhelpers/api/apiloader.go diff --git a/pkg/api/common/const.go b/pkg/armhelpers/api/common/const.go similarity index 100% rename from pkg/api/common/const.go rename to pkg/armhelpers/api/common/const.go diff --git a/pkg/api/common/helper.go b/pkg/armhelpers/api/common/helper.go similarity index 100% rename from pkg/api/common/helper.go rename to pkg/armhelpers/api/common/helper.go diff --git a/pkg/api/common/helper_test.go b/pkg/armhelpers/api/common/helper_test.go similarity index 100% rename from pkg/api/common/helper_test.go rename to pkg/armhelpers/api/common/helper_test.go diff --git a/pkg/api/common/net.go b/pkg/armhelpers/api/common/net.go similarity index 100% rename from pkg/api/common/net.go rename to pkg/armhelpers/api/common/net.go diff --git a/pkg/api/common/net_test.go b/pkg/armhelpers/api/common/net_test.go similarity index 100% rename from pkg/api/common/net_test.go rename to pkg/armhelpers/api/common/net_test.go diff --git a/pkg/api/const.go b/pkg/armhelpers/api/const.go similarity index 100% rename from pkg/api/const.go rename to pkg/armhelpers/api/const.go diff --git a/pkg/api/converterfromagentpoolonlyapi.go b/pkg/armhelpers/api/converterfromagentpoolonlyapi.go similarity index 100% rename from pkg/api/converterfromagentpoolonlyapi.go rename to pkg/armhelpers/api/converterfromagentpoolonlyapi.go diff --git a/pkg/api/converterfromapi.go b/pkg/armhelpers/api/converterfromapi.go similarity index 100% rename from pkg/api/converterfromapi.go rename to pkg/armhelpers/api/converterfromapi.go diff --git a/pkg/api/convertertoagentpoolonlyapi.go b/pkg/armhelpers/api/convertertoagentpoolonlyapi.go similarity index 100% rename from pkg/api/convertertoagentpoolonlyapi.go rename to pkg/armhelpers/api/convertertoagentpoolonlyapi.go diff --git a/pkg/api/convertertoagentpoolonlyapi_test.go b/pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go similarity index 100% rename from pkg/api/convertertoagentpoolonlyapi_test.go rename to pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go diff --git a/pkg/api/convertertoapi.go b/pkg/armhelpers/api/convertertoapi.go similarity index 100% rename from pkg/api/convertertoapi.go rename to pkg/armhelpers/api/convertertoapi.go diff --git a/pkg/api/convertertoapi_test.go b/pkg/armhelpers/api/convertertoapi_test.go similarity index 100% rename from pkg/api/convertertoapi_test.go rename to pkg/armhelpers/api/convertertoapi_test.go diff --git a/pkg/api/doc.go b/pkg/armhelpers/api/doc.go similarity index 100% rename from pkg/api/doc.go rename to pkg/armhelpers/api/doc.go diff --git a/pkg/api/orchestrators.go b/pkg/armhelpers/api/orchestrators.go similarity index 100% rename from pkg/api/orchestrators.go rename to pkg/armhelpers/api/orchestrators.go diff --git a/pkg/api/orchestrators_test.go b/pkg/armhelpers/api/orchestrators_test.go similarity index 100% rename from pkg/api/orchestrators_test.go rename to pkg/armhelpers/api/orchestrators_test.go diff --git a/pkg/api/strictjson.go b/pkg/armhelpers/api/strictjson.go similarity index 100% rename from pkg/api/strictjson.go rename to pkg/armhelpers/api/strictjson.go diff --git a/pkg/api/strictjson_test.go b/pkg/armhelpers/api/strictjson_test.go similarity index 100% rename from pkg/api/strictjson_test.go rename to pkg/armhelpers/api/strictjson_test.go diff --git a/pkg/api/types.go b/pkg/armhelpers/api/types.go similarity index 100% rename from pkg/api/types.go rename to pkg/armhelpers/api/types.go diff --git a/pkg/api/types_test.go b/pkg/armhelpers/api/types_test.go similarity index 100% rename from pkg/api/types_test.go rename to pkg/armhelpers/api/types_test.go diff --git a/pkg/api/v20160330/const.go b/pkg/armhelpers/api/v20160330/const.go similarity index 100% rename from pkg/api/v20160330/const.go rename to pkg/armhelpers/api/v20160330/const.go diff --git a/pkg/api/v20160330/doc.go b/pkg/armhelpers/api/v20160330/doc.go similarity index 100% rename from pkg/api/v20160330/doc.go rename to pkg/armhelpers/api/v20160330/doc.go diff --git a/pkg/api/v20160330/merge.go b/pkg/armhelpers/api/v20160330/merge.go similarity index 100% rename from pkg/api/v20160330/merge.go rename to pkg/armhelpers/api/v20160330/merge.go diff --git a/pkg/api/v20160330/merge_test.go b/pkg/armhelpers/api/v20160330/merge_test.go similarity index 100% rename from pkg/api/v20160330/merge_test.go rename to pkg/armhelpers/api/v20160330/merge_test.go diff --git a/pkg/api/v20160330/types.go b/pkg/armhelpers/api/v20160330/types.go similarity index 100% rename from pkg/api/v20160330/types.go rename to pkg/armhelpers/api/v20160330/types.go diff --git a/pkg/api/v20160330/types_test.go b/pkg/armhelpers/api/v20160330/types_test.go similarity index 100% rename from pkg/api/v20160330/types_test.go rename to pkg/armhelpers/api/v20160330/types_test.go diff --git a/pkg/api/v20160330/validate.go b/pkg/armhelpers/api/v20160330/validate.go similarity index 100% rename from pkg/api/v20160330/validate.go rename to pkg/armhelpers/api/v20160330/validate.go diff --git a/pkg/api/v20160930/const.go b/pkg/armhelpers/api/v20160930/const.go similarity index 100% rename from pkg/api/v20160930/const.go rename to pkg/armhelpers/api/v20160930/const.go diff --git a/pkg/api/v20160930/doc.go b/pkg/armhelpers/api/v20160930/doc.go similarity index 100% rename from pkg/api/v20160930/doc.go rename to pkg/armhelpers/api/v20160930/doc.go diff --git a/pkg/api/v20160930/merge.go b/pkg/armhelpers/api/v20160930/merge.go similarity index 100% rename from pkg/api/v20160930/merge.go rename to pkg/armhelpers/api/v20160930/merge.go diff --git a/pkg/api/v20160930/merge_test.go b/pkg/armhelpers/api/v20160930/merge_test.go similarity index 100% rename from pkg/api/v20160930/merge_test.go rename to pkg/armhelpers/api/v20160930/merge_test.go diff --git a/pkg/api/v20160930/types.go b/pkg/armhelpers/api/v20160930/types.go similarity index 100% rename from pkg/api/v20160930/types.go rename to pkg/armhelpers/api/v20160930/types.go diff --git a/pkg/api/v20160930/types_test.go b/pkg/armhelpers/api/v20160930/types_test.go similarity index 100% rename from pkg/api/v20160930/types_test.go rename to pkg/armhelpers/api/v20160930/types_test.go diff --git a/pkg/api/v20160930/validate.go b/pkg/armhelpers/api/v20160930/validate.go similarity index 100% rename from pkg/api/v20160930/validate.go rename to pkg/armhelpers/api/v20160930/validate.go diff --git a/pkg/api/v20170131/const.go b/pkg/armhelpers/api/v20170131/const.go similarity index 100% rename from pkg/api/v20170131/const.go rename to pkg/armhelpers/api/v20170131/const.go diff --git a/pkg/api/v20170131/doc.go b/pkg/armhelpers/api/v20170131/doc.go similarity index 100% rename from pkg/api/v20170131/doc.go rename to pkg/armhelpers/api/v20170131/doc.go diff --git a/pkg/api/v20170131/merge.go b/pkg/armhelpers/api/v20170131/merge.go similarity index 100% rename from pkg/api/v20170131/merge.go rename to pkg/armhelpers/api/v20170131/merge.go diff --git a/pkg/api/v20170131/merge_test.go b/pkg/armhelpers/api/v20170131/merge_test.go similarity index 100% rename from pkg/api/v20170131/merge_test.go rename to pkg/armhelpers/api/v20170131/merge_test.go diff --git a/pkg/api/v20170131/types.go b/pkg/armhelpers/api/v20170131/types.go similarity index 100% rename from pkg/api/v20170131/types.go rename to pkg/armhelpers/api/v20170131/types.go diff --git a/pkg/api/v20170131/types_test.go b/pkg/armhelpers/api/v20170131/types_test.go similarity index 100% rename from pkg/api/v20170131/types_test.go rename to pkg/armhelpers/api/v20170131/types_test.go diff --git a/pkg/api/v20170131/validate.go b/pkg/armhelpers/api/v20170131/validate.go similarity index 100% rename from pkg/api/v20170131/validate.go rename to pkg/armhelpers/api/v20170131/validate.go diff --git a/pkg/api/v20170131/validate_test.go b/pkg/armhelpers/api/v20170131/validate_test.go similarity index 100% rename from pkg/api/v20170131/validate_test.go rename to pkg/armhelpers/api/v20170131/validate_test.go diff --git a/pkg/api/v20170701/const.go b/pkg/armhelpers/api/v20170701/const.go similarity index 100% rename from pkg/api/v20170701/const.go rename to pkg/armhelpers/api/v20170701/const.go diff --git a/pkg/api/v20170701/doc.go b/pkg/armhelpers/api/v20170701/doc.go similarity index 100% rename from pkg/api/v20170701/doc.go rename to pkg/armhelpers/api/v20170701/doc.go diff --git a/pkg/api/v20170701/merge.go b/pkg/armhelpers/api/v20170701/merge.go similarity index 100% rename from pkg/api/v20170701/merge.go rename to pkg/armhelpers/api/v20170701/merge.go diff --git a/pkg/api/v20170701/merge_test.go b/pkg/armhelpers/api/v20170701/merge_test.go similarity index 100% rename from pkg/api/v20170701/merge_test.go rename to pkg/armhelpers/api/v20170701/merge_test.go diff --git a/pkg/api/v20170701/types.go b/pkg/armhelpers/api/v20170701/types.go similarity index 100% rename from pkg/api/v20170701/types.go rename to pkg/armhelpers/api/v20170701/types.go diff --git a/pkg/api/v20170701/types_test.go b/pkg/armhelpers/api/v20170701/types_test.go similarity index 100% rename from pkg/api/v20170701/types_test.go rename to pkg/armhelpers/api/v20170701/types_test.go diff --git a/pkg/api/v20170701/validate.go b/pkg/armhelpers/api/v20170701/validate.go similarity index 100% rename from pkg/api/v20170701/validate.go rename to pkg/armhelpers/api/v20170701/validate.go diff --git a/pkg/api/v20170701/validate_test.go b/pkg/armhelpers/api/v20170701/validate_test.go similarity index 100% rename from pkg/api/v20170701/validate_test.go rename to pkg/armhelpers/api/v20170701/validate_test.go diff --git a/pkg/api/v20170930/const.go b/pkg/armhelpers/api/v20170930/const.go similarity index 100% rename from pkg/api/v20170930/const.go rename to pkg/armhelpers/api/v20170930/const.go diff --git a/pkg/api/v20170930/types.go b/pkg/armhelpers/api/v20170930/types.go similarity index 100% rename from pkg/api/v20170930/types.go rename to pkg/armhelpers/api/v20170930/types.go diff --git a/pkg/api/v20170930/validate.go b/pkg/armhelpers/api/v20170930/validate.go similarity index 100% rename from pkg/api/v20170930/validate.go rename to pkg/armhelpers/api/v20170930/validate.go diff --git a/pkg/api/vlabs/const.go b/pkg/armhelpers/api/vlabs/const.go similarity index 100% rename from pkg/api/vlabs/const.go rename to pkg/armhelpers/api/vlabs/const.go diff --git a/pkg/api/vlabs/doc.go b/pkg/armhelpers/api/vlabs/doc.go similarity index 100% rename from pkg/api/vlabs/doc.go rename to pkg/armhelpers/api/vlabs/doc.go diff --git a/pkg/api/vlabs/merge.go b/pkg/armhelpers/api/vlabs/merge.go similarity index 100% rename from pkg/api/vlabs/merge.go rename to pkg/armhelpers/api/vlabs/merge.go diff --git a/pkg/api/vlabs/merge_test.go b/pkg/armhelpers/api/vlabs/merge_test.go similarity index 100% rename from pkg/api/vlabs/merge_test.go rename to pkg/armhelpers/api/vlabs/merge_test.go diff --git a/pkg/api/vlabs/orchestratorversiontypes.go b/pkg/armhelpers/api/vlabs/orchestratorversiontypes.go similarity index 100% rename from pkg/api/vlabs/orchestratorversiontypes.go rename to pkg/armhelpers/api/vlabs/orchestratorversiontypes.go diff --git a/pkg/api/vlabs/types.go b/pkg/armhelpers/api/vlabs/types.go similarity index 100% rename from pkg/api/vlabs/types.go rename to pkg/armhelpers/api/vlabs/types.go diff --git a/pkg/api/vlabs/validate.go b/pkg/armhelpers/api/vlabs/validate.go similarity index 100% rename from pkg/api/vlabs/validate.go rename to pkg/armhelpers/api/vlabs/validate.go diff --git a/pkg/api/vlabs/validate_test.go b/pkg/armhelpers/api/vlabs/validate_test.go similarity index 100% rename from pkg/api/vlabs/validate_test.go rename to pkg/armhelpers/api/vlabs/validate_test.go From 86b004e959ce838ebcd6e67c871532db40c50030 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 26 Oct 2017 10:14:20 -0700 Subject: [PATCH 04/24] Revert "merge master upstream" This reverts commit ab8d33d28a2b5e9a419e0018c9fee82b0134b11e. --- pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/const.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/doc.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types_test.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/validate.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/const.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/doc.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types_test.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/validate.go | 0 pkg/{armhelpers => }/api/apiloader.go | 0 pkg/{armhelpers => }/api/common/const.go | 0 pkg/{armhelpers => }/api/common/helper.go | 0 pkg/{armhelpers => }/api/common/helper_test.go | 0 pkg/{armhelpers => }/api/common/net.go | 0 pkg/{armhelpers => }/api/common/net_test.go | 0 pkg/{armhelpers => }/api/const.go | 0 pkg/{armhelpers => }/api/converterfromagentpoolonlyapi.go | 0 pkg/{armhelpers => }/api/converterfromapi.go | 0 pkg/{armhelpers => }/api/convertertoagentpoolonlyapi.go | 0 pkg/{armhelpers => }/api/convertertoagentpoolonlyapi_test.go | 0 pkg/{armhelpers => }/api/convertertoapi.go | 0 pkg/{armhelpers => }/api/convertertoapi_test.go | 0 pkg/{armhelpers => }/api/doc.go | 0 pkg/{armhelpers => }/api/orchestrators.go | 0 pkg/{armhelpers => }/api/orchestrators_test.go | 0 pkg/{armhelpers => }/api/strictjson.go | 0 pkg/{armhelpers => }/api/strictjson_test.go | 0 pkg/{armhelpers => }/api/types.go | 0 pkg/{armhelpers => }/api/types_test.go | 0 pkg/{armhelpers => }/api/v20160330/const.go | 0 pkg/{armhelpers => }/api/v20160330/doc.go | 0 pkg/{armhelpers => }/api/v20160330/merge.go | 0 pkg/{armhelpers => }/api/v20160330/merge_test.go | 0 pkg/{armhelpers => }/api/v20160330/types.go | 0 pkg/{armhelpers => }/api/v20160330/types_test.go | 0 pkg/{armhelpers => }/api/v20160330/validate.go | 0 pkg/{armhelpers => }/api/v20160930/const.go | 0 pkg/{armhelpers => }/api/v20160930/doc.go | 0 pkg/{armhelpers => }/api/v20160930/merge.go | 0 pkg/{armhelpers => }/api/v20160930/merge_test.go | 0 pkg/{armhelpers => }/api/v20160930/types.go | 0 pkg/{armhelpers => }/api/v20160930/types_test.go | 0 pkg/{armhelpers => }/api/v20160930/validate.go | 0 pkg/{armhelpers => }/api/v20170131/const.go | 0 pkg/{armhelpers => }/api/v20170131/doc.go | 0 pkg/{armhelpers => }/api/v20170131/merge.go | 0 pkg/{armhelpers => }/api/v20170131/merge_test.go | 0 pkg/{armhelpers => }/api/v20170131/types.go | 0 pkg/{armhelpers => }/api/v20170131/types_test.go | 0 pkg/{armhelpers => }/api/v20170131/validate.go | 0 pkg/{armhelpers => }/api/v20170131/validate_test.go | 0 pkg/{armhelpers => }/api/v20170701/const.go | 0 pkg/{armhelpers => }/api/v20170701/doc.go | 0 pkg/{armhelpers => }/api/v20170701/merge.go | 0 pkg/{armhelpers => }/api/v20170701/merge_test.go | 0 pkg/{armhelpers => }/api/v20170701/types.go | 0 pkg/{armhelpers => }/api/v20170701/types_test.go | 0 pkg/{armhelpers => }/api/v20170701/validate.go | 0 pkg/{armhelpers => }/api/v20170701/validate_test.go | 0 pkg/{armhelpers => }/api/v20170930/const.go | 0 pkg/{armhelpers => }/api/v20170930/types.go | 0 pkg/{armhelpers => }/api/v20170930/validate.go | 0 pkg/{armhelpers => }/api/vlabs/const.go | 0 pkg/{armhelpers => }/api/vlabs/doc.go | 0 pkg/{armhelpers => }/api/vlabs/merge.go | 0 pkg/{armhelpers => }/api/vlabs/merge_test.go | 0 pkg/{armhelpers => }/api/vlabs/orchestratorversiontypes.go | 0 pkg/{armhelpers => }/api/vlabs/types.go | 0 pkg/{armhelpers => }/api/vlabs/validate.go | 0 pkg/{armhelpers => }/api/vlabs/validate_test.go | 0 71 files changed, 0 insertions(+), 0 deletions(-) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/const.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/doc.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types_test.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/validate.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/const.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/doc.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types_test.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/validate.go (100%) rename pkg/{armhelpers => }/api/apiloader.go (100%) rename pkg/{armhelpers => }/api/common/const.go (100%) rename pkg/{armhelpers => }/api/common/helper.go (100%) rename pkg/{armhelpers => }/api/common/helper_test.go (100%) rename pkg/{armhelpers => }/api/common/net.go (100%) rename pkg/{armhelpers => }/api/common/net_test.go (100%) rename pkg/{armhelpers => }/api/const.go (100%) rename pkg/{armhelpers => }/api/converterfromagentpoolonlyapi.go (100%) rename pkg/{armhelpers => }/api/converterfromapi.go (100%) rename pkg/{armhelpers => }/api/convertertoagentpoolonlyapi.go (100%) rename pkg/{armhelpers => }/api/convertertoagentpoolonlyapi_test.go (100%) rename pkg/{armhelpers => }/api/convertertoapi.go (100%) rename pkg/{armhelpers => }/api/convertertoapi_test.go (100%) rename pkg/{armhelpers => }/api/doc.go (100%) rename pkg/{armhelpers => }/api/orchestrators.go (100%) rename pkg/{armhelpers => }/api/orchestrators_test.go (100%) rename pkg/{armhelpers => }/api/strictjson.go (100%) rename pkg/{armhelpers => }/api/strictjson_test.go (100%) rename pkg/{armhelpers => }/api/types.go (100%) rename pkg/{armhelpers => }/api/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/const.go (100%) rename pkg/{armhelpers => }/api/v20160330/doc.go (100%) rename pkg/{armhelpers => }/api/v20160330/merge.go (100%) rename pkg/{armhelpers => }/api/v20160330/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/types.go (100%) rename pkg/{armhelpers => }/api/v20160330/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/validate.go (100%) rename pkg/{armhelpers => }/api/v20160930/const.go (100%) rename pkg/{armhelpers => }/api/v20160930/doc.go (100%) rename pkg/{armhelpers => }/api/v20160930/merge.go (100%) rename pkg/{armhelpers => }/api/v20160930/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20160930/types.go (100%) rename pkg/{armhelpers => }/api/v20160930/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160930/validate.go (100%) rename pkg/{armhelpers => }/api/v20170131/const.go (100%) rename pkg/{armhelpers => }/api/v20170131/doc.go (100%) rename pkg/{armhelpers => }/api/v20170131/merge.go (100%) rename pkg/{armhelpers => }/api/v20170131/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20170131/types.go (100%) rename pkg/{armhelpers => }/api/v20170131/types_test.go (100%) rename pkg/{armhelpers => }/api/v20170131/validate.go (100%) rename pkg/{armhelpers => }/api/v20170131/validate_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/const.go (100%) rename pkg/{armhelpers => }/api/v20170701/doc.go (100%) rename pkg/{armhelpers => }/api/v20170701/merge.go (100%) rename pkg/{armhelpers => }/api/v20170701/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/types.go (100%) rename pkg/{armhelpers => }/api/v20170701/types_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/validate.go (100%) rename pkg/{armhelpers => }/api/v20170701/validate_test.go (100%) rename pkg/{armhelpers => }/api/v20170930/const.go (100%) rename pkg/{armhelpers => }/api/v20170930/types.go (100%) rename pkg/{armhelpers => }/api/v20170930/validate.go (100%) rename pkg/{armhelpers => }/api/vlabs/const.go (100%) rename pkg/{armhelpers => }/api/vlabs/doc.go (100%) rename pkg/{armhelpers => }/api/vlabs/merge.go (100%) rename pkg/{armhelpers => }/api/vlabs/merge_test.go (100%) rename pkg/{armhelpers => }/api/vlabs/orchestratorversiontypes.go (100%) rename pkg/{armhelpers => }/api/vlabs/types.go (100%) rename pkg/{armhelpers => }/api/vlabs/validate.go (100%) rename pkg/{armhelpers => }/api/vlabs/validate_test.go (100%) diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go b/pkg/api/agentPoolOnlyApi/v20170831/const.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go rename to pkg/api/agentPoolOnlyApi/v20170831/const.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go b/pkg/api/agentPoolOnlyApi/v20170831/doc.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go rename to pkg/api/agentPoolOnlyApi/v20170831/doc.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go b/pkg/api/agentPoolOnlyApi/v20170831/types.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go rename to pkg/api/agentPoolOnlyApi/v20170831/types.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go b/pkg/api/agentPoolOnlyApi/v20170831/types_test.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go rename to pkg/api/agentPoolOnlyApi/v20170831/types_test.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go b/pkg/api/agentPoolOnlyApi/v20170831/validate.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go rename to pkg/api/agentPoolOnlyApi/v20170831/validate.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go b/pkg/api/agentPoolOnlyApi/vlabs/const.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go rename to pkg/api/agentPoolOnlyApi/vlabs/const.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go b/pkg/api/agentPoolOnlyApi/vlabs/doc.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go rename to pkg/api/agentPoolOnlyApi/vlabs/doc.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go b/pkg/api/agentPoolOnlyApi/vlabs/types.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go rename to pkg/api/agentPoolOnlyApi/vlabs/types.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go b/pkg/api/agentPoolOnlyApi/vlabs/types_test.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go rename to pkg/api/agentPoolOnlyApi/vlabs/types_test.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go b/pkg/api/agentPoolOnlyApi/vlabs/validate.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go rename to pkg/api/agentPoolOnlyApi/vlabs/validate.go diff --git a/pkg/armhelpers/api/apiloader.go b/pkg/api/apiloader.go similarity index 100% rename from pkg/armhelpers/api/apiloader.go rename to pkg/api/apiloader.go diff --git a/pkg/armhelpers/api/common/const.go b/pkg/api/common/const.go similarity index 100% rename from pkg/armhelpers/api/common/const.go rename to pkg/api/common/const.go diff --git a/pkg/armhelpers/api/common/helper.go b/pkg/api/common/helper.go similarity index 100% rename from pkg/armhelpers/api/common/helper.go rename to pkg/api/common/helper.go diff --git a/pkg/armhelpers/api/common/helper_test.go b/pkg/api/common/helper_test.go similarity index 100% rename from pkg/armhelpers/api/common/helper_test.go rename to pkg/api/common/helper_test.go diff --git a/pkg/armhelpers/api/common/net.go b/pkg/api/common/net.go similarity index 100% rename from pkg/armhelpers/api/common/net.go rename to pkg/api/common/net.go diff --git a/pkg/armhelpers/api/common/net_test.go b/pkg/api/common/net_test.go similarity index 100% rename from pkg/armhelpers/api/common/net_test.go rename to pkg/api/common/net_test.go diff --git a/pkg/armhelpers/api/const.go b/pkg/api/const.go similarity index 100% rename from pkg/armhelpers/api/const.go rename to pkg/api/const.go diff --git a/pkg/armhelpers/api/converterfromagentpoolonlyapi.go b/pkg/api/converterfromagentpoolonlyapi.go similarity index 100% rename from pkg/armhelpers/api/converterfromagentpoolonlyapi.go rename to pkg/api/converterfromagentpoolonlyapi.go diff --git a/pkg/armhelpers/api/converterfromapi.go b/pkg/api/converterfromapi.go similarity index 100% rename from pkg/armhelpers/api/converterfromapi.go rename to pkg/api/converterfromapi.go diff --git a/pkg/armhelpers/api/convertertoagentpoolonlyapi.go b/pkg/api/convertertoagentpoolonlyapi.go similarity index 100% rename from pkg/armhelpers/api/convertertoagentpoolonlyapi.go rename to pkg/api/convertertoagentpoolonlyapi.go diff --git a/pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go b/pkg/api/convertertoagentpoolonlyapi_test.go similarity index 100% rename from pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go rename to pkg/api/convertertoagentpoolonlyapi_test.go diff --git a/pkg/armhelpers/api/convertertoapi.go b/pkg/api/convertertoapi.go similarity index 100% rename from pkg/armhelpers/api/convertertoapi.go rename to pkg/api/convertertoapi.go diff --git a/pkg/armhelpers/api/convertertoapi_test.go b/pkg/api/convertertoapi_test.go similarity index 100% rename from pkg/armhelpers/api/convertertoapi_test.go rename to pkg/api/convertertoapi_test.go diff --git a/pkg/armhelpers/api/doc.go b/pkg/api/doc.go similarity index 100% rename from pkg/armhelpers/api/doc.go rename to pkg/api/doc.go diff --git a/pkg/armhelpers/api/orchestrators.go b/pkg/api/orchestrators.go similarity index 100% rename from pkg/armhelpers/api/orchestrators.go rename to pkg/api/orchestrators.go diff --git a/pkg/armhelpers/api/orchestrators_test.go b/pkg/api/orchestrators_test.go similarity index 100% rename from pkg/armhelpers/api/orchestrators_test.go rename to pkg/api/orchestrators_test.go diff --git a/pkg/armhelpers/api/strictjson.go b/pkg/api/strictjson.go similarity index 100% rename from pkg/armhelpers/api/strictjson.go rename to pkg/api/strictjson.go diff --git a/pkg/armhelpers/api/strictjson_test.go b/pkg/api/strictjson_test.go similarity index 100% rename from pkg/armhelpers/api/strictjson_test.go rename to pkg/api/strictjson_test.go diff --git a/pkg/armhelpers/api/types.go b/pkg/api/types.go similarity index 100% rename from pkg/armhelpers/api/types.go rename to pkg/api/types.go diff --git a/pkg/armhelpers/api/types_test.go b/pkg/api/types_test.go similarity index 100% rename from pkg/armhelpers/api/types_test.go rename to pkg/api/types_test.go diff --git a/pkg/armhelpers/api/v20160330/const.go b/pkg/api/v20160330/const.go similarity index 100% rename from pkg/armhelpers/api/v20160330/const.go rename to pkg/api/v20160330/const.go diff --git a/pkg/armhelpers/api/v20160330/doc.go b/pkg/api/v20160330/doc.go similarity index 100% rename from pkg/armhelpers/api/v20160330/doc.go rename to pkg/api/v20160330/doc.go diff --git a/pkg/armhelpers/api/v20160330/merge.go b/pkg/api/v20160330/merge.go similarity index 100% rename from pkg/armhelpers/api/v20160330/merge.go rename to pkg/api/v20160330/merge.go diff --git a/pkg/armhelpers/api/v20160330/merge_test.go b/pkg/api/v20160330/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20160330/merge_test.go rename to pkg/api/v20160330/merge_test.go diff --git a/pkg/armhelpers/api/v20160330/types.go b/pkg/api/v20160330/types.go similarity index 100% rename from pkg/armhelpers/api/v20160330/types.go rename to pkg/api/v20160330/types.go diff --git a/pkg/armhelpers/api/v20160330/types_test.go b/pkg/api/v20160330/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20160330/types_test.go rename to pkg/api/v20160330/types_test.go diff --git a/pkg/armhelpers/api/v20160330/validate.go b/pkg/api/v20160330/validate.go similarity index 100% rename from pkg/armhelpers/api/v20160330/validate.go rename to pkg/api/v20160330/validate.go diff --git a/pkg/armhelpers/api/v20160930/const.go b/pkg/api/v20160930/const.go similarity index 100% rename from pkg/armhelpers/api/v20160930/const.go rename to pkg/api/v20160930/const.go diff --git a/pkg/armhelpers/api/v20160930/doc.go b/pkg/api/v20160930/doc.go similarity index 100% rename from pkg/armhelpers/api/v20160930/doc.go rename to pkg/api/v20160930/doc.go diff --git a/pkg/armhelpers/api/v20160930/merge.go b/pkg/api/v20160930/merge.go similarity index 100% rename from pkg/armhelpers/api/v20160930/merge.go rename to pkg/api/v20160930/merge.go diff --git a/pkg/armhelpers/api/v20160930/merge_test.go b/pkg/api/v20160930/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20160930/merge_test.go rename to pkg/api/v20160930/merge_test.go diff --git a/pkg/armhelpers/api/v20160930/types.go b/pkg/api/v20160930/types.go similarity index 100% rename from pkg/armhelpers/api/v20160930/types.go rename to pkg/api/v20160930/types.go diff --git a/pkg/armhelpers/api/v20160930/types_test.go b/pkg/api/v20160930/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20160930/types_test.go rename to pkg/api/v20160930/types_test.go diff --git a/pkg/armhelpers/api/v20160930/validate.go b/pkg/api/v20160930/validate.go similarity index 100% rename from pkg/armhelpers/api/v20160930/validate.go rename to pkg/api/v20160930/validate.go diff --git a/pkg/armhelpers/api/v20170131/const.go b/pkg/api/v20170131/const.go similarity index 100% rename from pkg/armhelpers/api/v20170131/const.go rename to pkg/api/v20170131/const.go diff --git a/pkg/armhelpers/api/v20170131/doc.go b/pkg/api/v20170131/doc.go similarity index 100% rename from pkg/armhelpers/api/v20170131/doc.go rename to pkg/api/v20170131/doc.go diff --git a/pkg/armhelpers/api/v20170131/merge.go b/pkg/api/v20170131/merge.go similarity index 100% rename from pkg/armhelpers/api/v20170131/merge.go rename to pkg/api/v20170131/merge.go diff --git a/pkg/armhelpers/api/v20170131/merge_test.go b/pkg/api/v20170131/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/merge_test.go rename to pkg/api/v20170131/merge_test.go diff --git a/pkg/armhelpers/api/v20170131/types.go b/pkg/api/v20170131/types.go similarity index 100% rename from pkg/armhelpers/api/v20170131/types.go rename to pkg/api/v20170131/types.go diff --git a/pkg/armhelpers/api/v20170131/types_test.go b/pkg/api/v20170131/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/types_test.go rename to pkg/api/v20170131/types_test.go diff --git a/pkg/armhelpers/api/v20170131/validate.go b/pkg/api/v20170131/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170131/validate.go rename to pkg/api/v20170131/validate.go diff --git a/pkg/armhelpers/api/v20170131/validate_test.go b/pkg/api/v20170131/validate_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/validate_test.go rename to pkg/api/v20170131/validate_test.go diff --git a/pkg/armhelpers/api/v20170701/const.go b/pkg/api/v20170701/const.go similarity index 100% rename from pkg/armhelpers/api/v20170701/const.go rename to pkg/api/v20170701/const.go diff --git a/pkg/armhelpers/api/v20170701/doc.go b/pkg/api/v20170701/doc.go similarity index 100% rename from pkg/armhelpers/api/v20170701/doc.go rename to pkg/api/v20170701/doc.go diff --git a/pkg/armhelpers/api/v20170701/merge.go b/pkg/api/v20170701/merge.go similarity index 100% rename from pkg/armhelpers/api/v20170701/merge.go rename to pkg/api/v20170701/merge.go diff --git a/pkg/armhelpers/api/v20170701/merge_test.go b/pkg/api/v20170701/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/merge_test.go rename to pkg/api/v20170701/merge_test.go diff --git a/pkg/armhelpers/api/v20170701/types.go b/pkg/api/v20170701/types.go similarity index 100% rename from pkg/armhelpers/api/v20170701/types.go rename to pkg/api/v20170701/types.go diff --git a/pkg/armhelpers/api/v20170701/types_test.go b/pkg/api/v20170701/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/types_test.go rename to pkg/api/v20170701/types_test.go diff --git a/pkg/armhelpers/api/v20170701/validate.go b/pkg/api/v20170701/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170701/validate.go rename to pkg/api/v20170701/validate.go diff --git a/pkg/armhelpers/api/v20170701/validate_test.go b/pkg/api/v20170701/validate_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/validate_test.go rename to pkg/api/v20170701/validate_test.go diff --git a/pkg/armhelpers/api/v20170930/const.go b/pkg/api/v20170930/const.go similarity index 100% rename from pkg/armhelpers/api/v20170930/const.go rename to pkg/api/v20170930/const.go diff --git a/pkg/armhelpers/api/v20170930/types.go b/pkg/api/v20170930/types.go similarity index 100% rename from pkg/armhelpers/api/v20170930/types.go rename to pkg/api/v20170930/types.go diff --git a/pkg/armhelpers/api/v20170930/validate.go b/pkg/api/v20170930/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170930/validate.go rename to pkg/api/v20170930/validate.go diff --git a/pkg/armhelpers/api/vlabs/const.go b/pkg/api/vlabs/const.go similarity index 100% rename from pkg/armhelpers/api/vlabs/const.go rename to pkg/api/vlabs/const.go diff --git a/pkg/armhelpers/api/vlabs/doc.go b/pkg/api/vlabs/doc.go similarity index 100% rename from pkg/armhelpers/api/vlabs/doc.go rename to pkg/api/vlabs/doc.go diff --git a/pkg/armhelpers/api/vlabs/merge.go b/pkg/api/vlabs/merge.go similarity index 100% rename from pkg/armhelpers/api/vlabs/merge.go rename to pkg/api/vlabs/merge.go diff --git a/pkg/armhelpers/api/vlabs/merge_test.go b/pkg/api/vlabs/merge_test.go similarity index 100% rename from pkg/armhelpers/api/vlabs/merge_test.go rename to pkg/api/vlabs/merge_test.go diff --git a/pkg/armhelpers/api/vlabs/orchestratorversiontypes.go b/pkg/api/vlabs/orchestratorversiontypes.go similarity index 100% rename from pkg/armhelpers/api/vlabs/orchestratorversiontypes.go rename to pkg/api/vlabs/orchestratorversiontypes.go diff --git a/pkg/armhelpers/api/vlabs/types.go b/pkg/api/vlabs/types.go similarity index 100% rename from pkg/armhelpers/api/vlabs/types.go rename to pkg/api/vlabs/types.go diff --git a/pkg/armhelpers/api/vlabs/validate.go b/pkg/api/vlabs/validate.go similarity index 100% rename from pkg/armhelpers/api/vlabs/validate.go rename to pkg/api/vlabs/validate.go diff --git a/pkg/armhelpers/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go similarity index 100% rename from pkg/armhelpers/api/vlabs/validate_test.go rename to pkg/api/vlabs/validate_test.go From b840a412c8c5afd44b80940f3f705991a2663e63 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Wed, 15 Nov 2017 15:36:31 -0800 Subject: [PATCH 05/24] added rescheduler addon --- ...teraddons-kube-rescheduler-deployment.yaml | 32 +++++++++++++++++++ parts/kubernetesmastercustomdata.yml | 8 +++++ parts/kubernetesparams.t | 7 ++++ pkg/acsengine/const.go | 2 ++ pkg/acsengine/engine.go | 4 +++ test/cluster-tests/kubernetes/test.sh | 2 +- 6 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml diff --git a/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml b/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml new file mode 100644 index 0000000000..e3b6ed128c --- /dev/null +++ b/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml @@ -0,0 +1,32 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: rescheduler + namespace: kube-system + labels: + k8s-app: rescheduler + kubernetes.io/cluster-service: "true" + addonmanager.kubernetes.io/mode: Reconcile +spec: + replicas: 1 + selector: + matchLabels: + k8s-app: rescheduler + template: + metadata: + labels: + k8s-app: rescheduler + annotations: + scheduler.alpha.kubernetes.io/critical-pod: '' + spec: + containers: + - image: + name: rescheduler + resources: + requests: + cpu: 10m + memory: 100Mi + command: + - sh + - -c + - '/rescheduler' \ No newline at end of file diff --git a/parts/kubernetesmastercustomdata.yml b/parts/kubernetesmastercustomdata.yml index 49474c187c..8fdb17aa28 100644 --- a/parts/kubernetesmastercustomdata.yml +++ b/parts/kubernetesmastercustomdata.yml @@ -140,6 +140,13 @@ write_files: content: !!binary | MASTER_ADDON_HEAPSTER_DEPLOYMENT_B64_GZIP_STR +- path: /etc/kubernetes/addons/kube-rescheduler-deployment.yaml + permissions: "0644" + encoding: gzip + owner: "root" + content: !!binary | + MASTER_ADDON_RESCHEDULER_DEPLOYMENT_B64_GZIP_STR + - path: /etc/kubernetes/addons/azure-storage-classes.yaml permissions: "0644" encoding: gzip @@ -271,6 +278,7 @@ write_files: {{if not .OrchestratorProfile.KubernetesConfig.DisabledAddons.Dashboard}} sed -i "s||{{WrapAsVariable "kubernetesDashboardSpec"}}|g" "/etc/kubernetes/addons/kubernetes-dashboard-deployment.yaml" {{end}} + sed -i "s||{{WrapAsVariable "kubernetesReschedulerSpec"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesTillerSpec"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesTillerCPURequests"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesTillerMemoryRequests"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" diff --git a/parts/kubernetesparams.t b/parts/kubernetesparams.t index 5c6253f2ee..399209c0a7 100644 --- a/parts/kubernetesparams.t +++ b/parts/kubernetesparams.t @@ -197,6 +197,13 @@ }, "type": "string" }, + "kubernetesReschedulerSpec": { + {{PopulateClassicModeDefaultValue "kubernetesReschedulerSpec"}} + "metadata": { + "description": "The container spec for rescheduler." + }, + "type": "string" + }, "kubernetesPodInfraContainerSpec": { {{PopulateClassicModeDefaultValue "kubernetesPodInfraContainerSpec"}} "metadata": { diff --git a/pkg/acsengine/const.go b/pkg/acsengine/const.go index 1d85bac610..0a76e3e355 100644 --- a/pkg/acsengine/const.go +++ b/pkg/acsengine/const.go @@ -88,6 +88,8 @@ const ( DefaultOrchestratorName = "k8s" // DefaultEtcdDiskSize specifies the default size for Kubernetes master etcd disk volumes in GB DefaultEtcdDiskSize = "128" + // DefaultReschedulerImage defines the rescheduler deployment version on Kubernetes Clusters + DefaultReschedulerImage = "rescheduler:v0.3.1", ) const ( diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go index 54377e2d35..c6708470b8 100644 --- a/pkg/acsengine/engine.go +++ b/pkg/acsengine/engine.go @@ -121,6 +121,7 @@ var kubernetesAddonYamls = map[string]string{ "MASTER_ADDON_KUBERNETES_DASHBOARD_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kubernetes-dashboard-deployment.yaml", "MASTER_ADDON_AZURE_STORAGE_CLASSES_B64_GZIP_STR": "kubernetesmasteraddons-azure-storage-classes.yaml", "MASTER_ADDON_TILLER_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-tiller-deployment.yaml", + "MASTER_ADDON_RESCHEDULER_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kube-rescheduler-deployment.yaml", } var kubernetesAddonYamls15 = map[string]string{ @@ -553,6 +554,7 @@ func getParameters(cs *api.ContainerService, isClassicMode bool, generatorCode s addValue(parametersMap, "kubernetesTillerCPULimit", properties.OrchestratorProfile.KubernetesConfig.TillerCPULimit) addValue(parametersMap, "kubernetesTillerMemoryRequests", properties.OrchestratorProfile.KubernetesConfig.TillerMemoryRequests) addValue(parametersMap, "kubernetesTillerMemoryLimit", properties.OrchestratorProfile.KubernetesConfig.TillerMemoryLimit) + addValue(parametersMap, "kubernetesReschedulerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeImages[KubernetesVersion]["rescheduler"]) addValue(parametersMap, "kubernetesKubeDNSSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["dns"]) addValue(parametersMap, "kubernetesPodInfraContainerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["pause"]) addValue(parametersMap, "kubernetesNodeStatusUpdateFrequency", properties.OrchestratorProfile.KubernetesConfig.NodeStatusUpdateFrequency) @@ -1175,6 +1177,8 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat val = DefaultTillerCPULimit case "kubernetesTillerMemoryLimit": val = DefaultTillerMemoryLimit + case "kubernetesReschedulerSpec": + val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeImages[kubernetesVersion]["rescheduler"] case "kubernetesKubeDNSSpec": val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["dns"] case "kubernetesPodInfraContainerSpec": diff --git a/test/cluster-tests/kubernetes/test.sh b/test/cluster-tests/kubernetes/test.sh index e6fe85a577..8d38e61ffd 100755 --- a/test/cluster-tests/kubernetes/test.sh +++ b/test/cluster-tests/kubernetes/test.sh @@ -102,7 +102,7 @@ fi ###### Check existence and status of essential pods # we test other essential pods (kube-dns, kube-proxy) separately -pods="heapster kube-addon-manager kube-apiserver kube-controller-manager kube-scheduler tiller" +pods="heapster rescheduler kube-addon-manager kube-apiserver kube-controller-manager kube-scheduler tiller" log "Checking $pods" count=60 From 9c2a09aa4fbb4006588f60896bd8184e6f7e54b9 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Wed, 15 Nov 2017 15:48:55 -0800 Subject: [PATCH 06/24] fix typo --- pkg/acsengine/const.go | 2 +- pkg/acsengine/engine.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/acsengine/const.go b/pkg/acsengine/const.go index 0a76e3e355..0d9d49b1ed 100644 --- a/pkg/acsengine/const.go +++ b/pkg/acsengine/const.go @@ -89,7 +89,7 @@ const ( // DefaultEtcdDiskSize specifies the default size for Kubernetes master etcd disk volumes in GB DefaultEtcdDiskSize = "128" // DefaultReschedulerImage defines the rescheduler deployment version on Kubernetes Clusters - DefaultReschedulerImage = "rescheduler:v0.3.1", + DefaultReschedulerImage = "rescheduler:v0.3.1" ) const ( diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go index c6708470b8..ecf9172fbe 100644 --- a/pkg/acsengine/engine.go +++ b/pkg/acsengine/engine.go @@ -554,7 +554,7 @@ func getParameters(cs *api.ContainerService, isClassicMode bool, generatorCode s addValue(parametersMap, "kubernetesTillerCPULimit", properties.OrchestratorProfile.KubernetesConfig.TillerCPULimit) addValue(parametersMap, "kubernetesTillerMemoryRequests", properties.OrchestratorProfile.KubernetesConfig.TillerMemoryRequests) addValue(parametersMap, "kubernetesTillerMemoryLimit", properties.OrchestratorProfile.KubernetesConfig.TillerMemoryLimit) - addValue(parametersMap, "kubernetesReschedulerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeImages[KubernetesVersion]["rescheduler"]) + addValue(parametersMap, "kubernetesReschedulerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["rescheduler"]) addValue(parametersMap, "kubernetesKubeDNSSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["dns"]) addValue(parametersMap, "kubernetesPodInfraContainerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["pause"]) addValue(parametersMap, "kubernetesNodeStatusUpdateFrequency", properties.OrchestratorProfile.KubernetesConfig.NodeStatusUpdateFrequency) @@ -1178,7 +1178,7 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat case "kubernetesTillerMemoryLimit": val = DefaultTillerMemoryLimit case "kubernetesReschedulerSpec": - val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeImages[kubernetesVersion]["rescheduler"] + val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["rescheduler"] case "kubernetesKubeDNSSpec": val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["dns"] case "kubernetesPodInfraContainerSpec": From ae8d6209200e219182d38a8d090db171725c57a0 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 26 Oct 2017 10:11:29 -0700 Subject: [PATCH 07/24] merge master upstream --- pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/const.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/doc.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types_test.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/validate.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/const.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/doc.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types_test.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/validate.go | 0 pkg/{ => armhelpers}/api/apiloader.go | 0 pkg/{ => armhelpers}/api/common/const.go | 0 pkg/{ => armhelpers}/api/common/helper.go | 0 pkg/{ => armhelpers}/api/common/helper_test.go | 0 pkg/{ => armhelpers}/api/common/net.go | 0 pkg/{ => armhelpers}/api/common/net_test.go | 0 pkg/{ => armhelpers}/api/const.go | 0 pkg/{ => armhelpers}/api/converterfromagentpoolonlyapi.go | 0 pkg/{ => armhelpers}/api/converterfromapi.go | 0 pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi.go | 0 pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi_test.go | 0 pkg/{ => armhelpers}/api/convertertoapi.go | 0 pkg/{ => armhelpers}/api/convertertoapi_test.go | 0 pkg/{ => armhelpers}/api/doc.go | 0 pkg/{ => armhelpers}/api/orchestrators.go | 0 pkg/{ => armhelpers}/api/orchestrators_test.go | 0 pkg/{ => armhelpers}/api/strictjson.go | 0 pkg/{ => armhelpers}/api/strictjson_test.go | 0 pkg/{ => armhelpers}/api/types.go | 0 pkg/{ => armhelpers}/api/types_test.go | 0 pkg/{ => armhelpers}/api/v20160330/const.go | 0 pkg/{ => armhelpers}/api/v20160330/doc.go | 0 pkg/{ => armhelpers}/api/v20160330/merge.go | 0 pkg/{ => armhelpers}/api/v20160330/merge_test.go | 0 pkg/{ => armhelpers}/api/v20160330/types.go | 0 pkg/{ => armhelpers}/api/v20160330/types_test.go | 0 pkg/{ => armhelpers}/api/v20160330/validate.go | 0 pkg/{ => armhelpers}/api/v20160930/const.go | 0 pkg/{ => armhelpers}/api/v20160930/doc.go | 0 pkg/{ => armhelpers}/api/v20160930/merge.go | 0 pkg/{ => armhelpers}/api/v20160930/merge_test.go | 0 pkg/{ => armhelpers}/api/v20160930/types.go | 0 pkg/{ => armhelpers}/api/v20160930/types_test.go | 0 pkg/{ => armhelpers}/api/v20160930/validate.go | 0 pkg/{ => armhelpers}/api/v20170131/const.go | 0 pkg/{ => armhelpers}/api/v20170131/doc.go | 0 pkg/{ => armhelpers}/api/v20170131/merge.go | 0 pkg/{ => armhelpers}/api/v20170131/merge_test.go | 0 pkg/{ => armhelpers}/api/v20170131/types.go | 0 pkg/{ => armhelpers}/api/v20170131/types_test.go | 0 pkg/{ => armhelpers}/api/v20170131/validate.go | 0 pkg/{ => armhelpers}/api/v20170131/validate_test.go | 0 pkg/{ => armhelpers}/api/v20170701/const.go | 0 pkg/{ => armhelpers}/api/v20170701/doc.go | 0 pkg/{ => armhelpers}/api/v20170701/merge.go | 0 pkg/{ => armhelpers}/api/v20170701/merge_test.go | 0 pkg/{ => armhelpers}/api/v20170701/types.go | 0 pkg/{ => armhelpers}/api/v20170701/types_test.go | 0 pkg/{ => armhelpers}/api/v20170701/validate.go | 0 pkg/{ => armhelpers}/api/v20170701/validate_test.go | 0 pkg/{ => armhelpers}/api/v20170930/const.go | 0 pkg/{ => armhelpers}/api/v20170930/types.go | 0 pkg/{ => armhelpers}/api/v20170930/validate.go | 0 pkg/{ => armhelpers}/api/vlabs/const.go | 0 pkg/{ => armhelpers}/api/vlabs/doc.go | 0 pkg/{ => armhelpers}/api/vlabs/merge.go | 0 pkg/{ => armhelpers}/api/vlabs/merge_test.go | 0 pkg/{ => armhelpers}/api/vlabs/orchestratorversiontypes.go | 0 pkg/{ => armhelpers}/api/vlabs/types.go | 0 pkg/{ => armhelpers}/api/vlabs/validate.go | 0 pkg/{ => armhelpers}/api/vlabs/validate_test.go | 0 71 files changed, 0 insertions(+), 0 deletions(-) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/const.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/doc.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types_test.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/validate.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/const.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/doc.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types_test.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/validate.go (100%) rename pkg/{ => armhelpers}/api/apiloader.go (100%) rename pkg/{ => armhelpers}/api/common/const.go (100%) rename pkg/{ => armhelpers}/api/common/helper.go (100%) rename pkg/{ => armhelpers}/api/common/helper_test.go (100%) rename pkg/{ => armhelpers}/api/common/net.go (100%) rename pkg/{ => armhelpers}/api/common/net_test.go (100%) rename pkg/{ => armhelpers}/api/const.go (100%) rename pkg/{ => armhelpers}/api/converterfromagentpoolonlyapi.go (100%) rename pkg/{ => armhelpers}/api/converterfromapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi_test.go (100%) rename pkg/{ => armhelpers}/api/convertertoapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoapi_test.go (100%) rename pkg/{ => armhelpers}/api/doc.go (100%) rename pkg/{ => armhelpers}/api/orchestrators.go (100%) rename pkg/{ => armhelpers}/api/orchestrators_test.go (100%) rename pkg/{ => armhelpers}/api/strictjson.go (100%) rename pkg/{ => armhelpers}/api/strictjson_test.go (100%) rename pkg/{ => armhelpers}/api/types.go (100%) rename pkg/{ => armhelpers}/api/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/const.go (100%) rename pkg/{ => armhelpers}/api/v20160330/doc.go (100%) rename pkg/{ => armhelpers}/api/v20160330/merge.go (100%) rename pkg/{ => armhelpers}/api/v20160330/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/types.go (100%) rename pkg/{ => armhelpers}/api/v20160330/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/validate.go (100%) rename pkg/{ => armhelpers}/api/v20160930/const.go (100%) rename pkg/{ => armhelpers}/api/v20160930/doc.go (100%) rename pkg/{ => armhelpers}/api/v20160930/merge.go (100%) rename pkg/{ => armhelpers}/api/v20160930/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20160930/types.go (100%) rename pkg/{ => armhelpers}/api/v20160930/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160930/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170131/const.go (100%) rename pkg/{ => armhelpers}/api/v20170131/doc.go (100%) rename pkg/{ => armhelpers}/api/v20170131/merge.go (100%) rename pkg/{ => armhelpers}/api/v20170131/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20170131/types.go (100%) rename pkg/{ => armhelpers}/api/v20170131/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20170131/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170131/validate_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/const.go (100%) rename pkg/{ => armhelpers}/api/v20170701/doc.go (100%) rename pkg/{ => armhelpers}/api/v20170701/merge.go (100%) rename pkg/{ => armhelpers}/api/v20170701/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/types.go (100%) rename pkg/{ => armhelpers}/api/v20170701/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170701/validate_test.go (100%) rename pkg/{ => armhelpers}/api/v20170930/const.go (100%) rename pkg/{ => armhelpers}/api/v20170930/types.go (100%) rename pkg/{ => armhelpers}/api/v20170930/validate.go (100%) rename pkg/{ => armhelpers}/api/vlabs/const.go (100%) rename pkg/{ => armhelpers}/api/vlabs/doc.go (100%) rename pkg/{ => armhelpers}/api/vlabs/merge.go (100%) rename pkg/{ => armhelpers}/api/vlabs/merge_test.go (100%) rename pkg/{ => armhelpers}/api/vlabs/orchestratorversiontypes.go (100%) rename pkg/{ => armhelpers}/api/vlabs/types.go (100%) rename pkg/{ => armhelpers}/api/vlabs/validate.go (100%) rename pkg/{ => armhelpers}/api/vlabs/validate_test.go (100%) diff --git a/pkg/api/agentPoolOnlyApi/v20170831/const.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/const.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/doc.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/doc.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/types.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/types.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/types_test.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/types_test.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/validate.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/validate.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/const.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/const.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/doc.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/doc.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/types.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/types.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/types_test.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/types_test.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/validate.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/validate.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go diff --git a/pkg/api/apiloader.go b/pkg/armhelpers/api/apiloader.go similarity index 100% rename from pkg/api/apiloader.go rename to pkg/armhelpers/api/apiloader.go diff --git a/pkg/api/common/const.go b/pkg/armhelpers/api/common/const.go similarity index 100% rename from pkg/api/common/const.go rename to pkg/armhelpers/api/common/const.go diff --git a/pkg/api/common/helper.go b/pkg/armhelpers/api/common/helper.go similarity index 100% rename from pkg/api/common/helper.go rename to pkg/armhelpers/api/common/helper.go diff --git a/pkg/api/common/helper_test.go b/pkg/armhelpers/api/common/helper_test.go similarity index 100% rename from pkg/api/common/helper_test.go rename to pkg/armhelpers/api/common/helper_test.go diff --git a/pkg/api/common/net.go b/pkg/armhelpers/api/common/net.go similarity index 100% rename from pkg/api/common/net.go rename to pkg/armhelpers/api/common/net.go diff --git a/pkg/api/common/net_test.go b/pkg/armhelpers/api/common/net_test.go similarity index 100% rename from pkg/api/common/net_test.go rename to pkg/armhelpers/api/common/net_test.go diff --git a/pkg/api/const.go b/pkg/armhelpers/api/const.go similarity index 100% rename from pkg/api/const.go rename to pkg/armhelpers/api/const.go diff --git a/pkg/api/converterfromagentpoolonlyapi.go b/pkg/armhelpers/api/converterfromagentpoolonlyapi.go similarity index 100% rename from pkg/api/converterfromagentpoolonlyapi.go rename to pkg/armhelpers/api/converterfromagentpoolonlyapi.go diff --git a/pkg/api/converterfromapi.go b/pkg/armhelpers/api/converterfromapi.go similarity index 100% rename from pkg/api/converterfromapi.go rename to pkg/armhelpers/api/converterfromapi.go diff --git a/pkg/api/convertertoagentpoolonlyapi.go b/pkg/armhelpers/api/convertertoagentpoolonlyapi.go similarity index 100% rename from pkg/api/convertertoagentpoolonlyapi.go rename to pkg/armhelpers/api/convertertoagentpoolonlyapi.go diff --git a/pkg/api/convertertoagentpoolonlyapi_test.go b/pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go similarity index 100% rename from pkg/api/convertertoagentpoolonlyapi_test.go rename to pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go diff --git a/pkg/api/convertertoapi.go b/pkg/armhelpers/api/convertertoapi.go similarity index 100% rename from pkg/api/convertertoapi.go rename to pkg/armhelpers/api/convertertoapi.go diff --git a/pkg/api/convertertoapi_test.go b/pkg/armhelpers/api/convertertoapi_test.go similarity index 100% rename from pkg/api/convertertoapi_test.go rename to pkg/armhelpers/api/convertertoapi_test.go diff --git a/pkg/api/doc.go b/pkg/armhelpers/api/doc.go similarity index 100% rename from pkg/api/doc.go rename to pkg/armhelpers/api/doc.go diff --git a/pkg/api/orchestrators.go b/pkg/armhelpers/api/orchestrators.go similarity index 100% rename from pkg/api/orchestrators.go rename to pkg/armhelpers/api/orchestrators.go diff --git a/pkg/api/orchestrators_test.go b/pkg/armhelpers/api/orchestrators_test.go similarity index 100% rename from pkg/api/orchestrators_test.go rename to pkg/armhelpers/api/orchestrators_test.go diff --git a/pkg/api/strictjson.go b/pkg/armhelpers/api/strictjson.go similarity index 100% rename from pkg/api/strictjson.go rename to pkg/armhelpers/api/strictjson.go diff --git a/pkg/api/strictjson_test.go b/pkg/armhelpers/api/strictjson_test.go similarity index 100% rename from pkg/api/strictjson_test.go rename to pkg/armhelpers/api/strictjson_test.go diff --git a/pkg/api/types.go b/pkg/armhelpers/api/types.go similarity index 100% rename from pkg/api/types.go rename to pkg/armhelpers/api/types.go diff --git a/pkg/api/types_test.go b/pkg/armhelpers/api/types_test.go similarity index 100% rename from pkg/api/types_test.go rename to pkg/armhelpers/api/types_test.go diff --git a/pkg/api/v20160330/const.go b/pkg/armhelpers/api/v20160330/const.go similarity index 100% rename from pkg/api/v20160330/const.go rename to pkg/armhelpers/api/v20160330/const.go diff --git a/pkg/api/v20160330/doc.go b/pkg/armhelpers/api/v20160330/doc.go similarity index 100% rename from pkg/api/v20160330/doc.go rename to pkg/armhelpers/api/v20160330/doc.go diff --git a/pkg/api/v20160330/merge.go b/pkg/armhelpers/api/v20160330/merge.go similarity index 100% rename from pkg/api/v20160330/merge.go rename to pkg/armhelpers/api/v20160330/merge.go diff --git a/pkg/api/v20160330/merge_test.go b/pkg/armhelpers/api/v20160330/merge_test.go similarity index 100% rename from pkg/api/v20160330/merge_test.go rename to pkg/armhelpers/api/v20160330/merge_test.go diff --git a/pkg/api/v20160330/types.go b/pkg/armhelpers/api/v20160330/types.go similarity index 100% rename from pkg/api/v20160330/types.go rename to pkg/armhelpers/api/v20160330/types.go diff --git a/pkg/api/v20160330/types_test.go b/pkg/armhelpers/api/v20160330/types_test.go similarity index 100% rename from pkg/api/v20160330/types_test.go rename to pkg/armhelpers/api/v20160330/types_test.go diff --git a/pkg/api/v20160330/validate.go b/pkg/armhelpers/api/v20160330/validate.go similarity index 100% rename from pkg/api/v20160330/validate.go rename to pkg/armhelpers/api/v20160330/validate.go diff --git a/pkg/api/v20160930/const.go b/pkg/armhelpers/api/v20160930/const.go similarity index 100% rename from pkg/api/v20160930/const.go rename to pkg/armhelpers/api/v20160930/const.go diff --git a/pkg/api/v20160930/doc.go b/pkg/armhelpers/api/v20160930/doc.go similarity index 100% rename from pkg/api/v20160930/doc.go rename to pkg/armhelpers/api/v20160930/doc.go diff --git a/pkg/api/v20160930/merge.go b/pkg/armhelpers/api/v20160930/merge.go similarity index 100% rename from pkg/api/v20160930/merge.go rename to pkg/armhelpers/api/v20160930/merge.go diff --git a/pkg/api/v20160930/merge_test.go b/pkg/armhelpers/api/v20160930/merge_test.go similarity index 100% rename from pkg/api/v20160930/merge_test.go rename to pkg/armhelpers/api/v20160930/merge_test.go diff --git a/pkg/api/v20160930/types.go b/pkg/armhelpers/api/v20160930/types.go similarity index 100% rename from pkg/api/v20160930/types.go rename to pkg/armhelpers/api/v20160930/types.go diff --git a/pkg/api/v20160930/types_test.go b/pkg/armhelpers/api/v20160930/types_test.go similarity index 100% rename from pkg/api/v20160930/types_test.go rename to pkg/armhelpers/api/v20160930/types_test.go diff --git a/pkg/api/v20160930/validate.go b/pkg/armhelpers/api/v20160930/validate.go similarity index 100% rename from pkg/api/v20160930/validate.go rename to pkg/armhelpers/api/v20160930/validate.go diff --git a/pkg/api/v20170131/const.go b/pkg/armhelpers/api/v20170131/const.go similarity index 100% rename from pkg/api/v20170131/const.go rename to pkg/armhelpers/api/v20170131/const.go diff --git a/pkg/api/v20170131/doc.go b/pkg/armhelpers/api/v20170131/doc.go similarity index 100% rename from pkg/api/v20170131/doc.go rename to pkg/armhelpers/api/v20170131/doc.go diff --git a/pkg/api/v20170131/merge.go b/pkg/armhelpers/api/v20170131/merge.go similarity index 100% rename from pkg/api/v20170131/merge.go rename to pkg/armhelpers/api/v20170131/merge.go diff --git a/pkg/api/v20170131/merge_test.go b/pkg/armhelpers/api/v20170131/merge_test.go similarity index 100% rename from pkg/api/v20170131/merge_test.go rename to pkg/armhelpers/api/v20170131/merge_test.go diff --git a/pkg/api/v20170131/types.go b/pkg/armhelpers/api/v20170131/types.go similarity index 100% rename from pkg/api/v20170131/types.go rename to pkg/armhelpers/api/v20170131/types.go diff --git a/pkg/api/v20170131/types_test.go b/pkg/armhelpers/api/v20170131/types_test.go similarity index 100% rename from pkg/api/v20170131/types_test.go rename to pkg/armhelpers/api/v20170131/types_test.go diff --git a/pkg/api/v20170131/validate.go b/pkg/armhelpers/api/v20170131/validate.go similarity index 100% rename from pkg/api/v20170131/validate.go rename to pkg/armhelpers/api/v20170131/validate.go diff --git a/pkg/api/v20170131/validate_test.go b/pkg/armhelpers/api/v20170131/validate_test.go similarity index 100% rename from pkg/api/v20170131/validate_test.go rename to pkg/armhelpers/api/v20170131/validate_test.go diff --git a/pkg/api/v20170701/const.go b/pkg/armhelpers/api/v20170701/const.go similarity index 100% rename from pkg/api/v20170701/const.go rename to pkg/armhelpers/api/v20170701/const.go diff --git a/pkg/api/v20170701/doc.go b/pkg/armhelpers/api/v20170701/doc.go similarity index 100% rename from pkg/api/v20170701/doc.go rename to pkg/armhelpers/api/v20170701/doc.go diff --git a/pkg/api/v20170701/merge.go b/pkg/armhelpers/api/v20170701/merge.go similarity index 100% rename from pkg/api/v20170701/merge.go rename to pkg/armhelpers/api/v20170701/merge.go diff --git a/pkg/api/v20170701/merge_test.go b/pkg/armhelpers/api/v20170701/merge_test.go similarity index 100% rename from pkg/api/v20170701/merge_test.go rename to pkg/armhelpers/api/v20170701/merge_test.go diff --git a/pkg/api/v20170701/types.go b/pkg/armhelpers/api/v20170701/types.go similarity index 100% rename from pkg/api/v20170701/types.go rename to pkg/armhelpers/api/v20170701/types.go diff --git a/pkg/api/v20170701/types_test.go b/pkg/armhelpers/api/v20170701/types_test.go similarity index 100% rename from pkg/api/v20170701/types_test.go rename to pkg/armhelpers/api/v20170701/types_test.go diff --git a/pkg/api/v20170701/validate.go b/pkg/armhelpers/api/v20170701/validate.go similarity index 100% rename from pkg/api/v20170701/validate.go rename to pkg/armhelpers/api/v20170701/validate.go diff --git a/pkg/api/v20170701/validate_test.go b/pkg/armhelpers/api/v20170701/validate_test.go similarity index 100% rename from pkg/api/v20170701/validate_test.go rename to pkg/armhelpers/api/v20170701/validate_test.go diff --git a/pkg/api/v20170930/const.go b/pkg/armhelpers/api/v20170930/const.go similarity index 100% rename from pkg/api/v20170930/const.go rename to pkg/armhelpers/api/v20170930/const.go diff --git a/pkg/api/v20170930/types.go b/pkg/armhelpers/api/v20170930/types.go similarity index 100% rename from pkg/api/v20170930/types.go rename to pkg/armhelpers/api/v20170930/types.go diff --git a/pkg/api/v20170930/validate.go b/pkg/armhelpers/api/v20170930/validate.go similarity index 100% rename from pkg/api/v20170930/validate.go rename to pkg/armhelpers/api/v20170930/validate.go diff --git a/pkg/api/vlabs/const.go b/pkg/armhelpers/api/vlabs/const.go similarity index 100% rename from pkg/api/vlabs/const.go rename to pkg/armhelpers/api/vlabs/const.go diff --git a/pkg/api/vlabs/doc.go b/pkg/armhelpers/api/vlabs/doc.go similarity index 100% rename from pkg/api/vlabs/doc.go rename to pkg/armhelpers/api/vlabs/doc.go diff --git a/pkg/api/vlabs/merge.go b/pkg/armhelpers/api/vlabs/merge.go similarity index 100% rename from pkg/api/vlabs/merge.go rename to pkg/armhelpers/api/vlabs/merge.go diff --git a/pkg/api/vlabs/merge_test.go b/pkg/armhelpers/api/vlabs/merge_test.go similarity index 100% rename from pkg/api/vlabs/merge_test.go rename to pkg/armhelpers/api/vlabs/merge_test.go diff --git a/pkg/api/vlabs/orchestratorversiontypes.go b/pkg/armhelpers/api/vlabs/orchestratorversiontypes.go similarity index 100% rename from pkg/api/vlabs/orchestratorversiontypes.go rename to pkg/armhelpers/api/vlabs/orchestratorversiontypes.go diff --git a/pkg/api/vlabs/types.go b/pkg/armhelpers/api/vlabs/types.go similarity index 100% rename from pkg/api/vlabs/types.go rename to pkg/armhelpers/api/vlabs/types.go diff --git a/pkg/api/vlabs/validate.go b/pkg/armhelpers/api/vlabs/validate.go similarity index 100% rename from pkg/api/vlabs/validate.go rename to pkg/armhelpers/api/vlabs/validate.go diff --git a/pkg/api/vlabs/validate_test.go b/pkg/armhelpers/api/vlabs/validate_test.go similarity index 100% rename from pkg/api/vlabs/validate_test.go rename to pkg/armhelpers/api/vlabs/validate_test.go From d31849e4c0ee92039320a136d3e4e15b953fc436 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 26 Oct 2017 10:14:20 -0700 Subject: [PATCH 08/24] Revert "merge master upstream" This reverts commit ab8d33d28a2b5e9a419e0018c9fee82b0134b11e. --- pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/const.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/doc.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types_test.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/validate.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/const.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/doc.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types_test.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/validate.go | 0 pkg/{armhelpers => }/api/apiloader.go | 0 pkg/{armhelpers => }/api/common/const.go | 0 pkg/{armhelpers => }/api/common/helper.go | 0 pkg/{armhelpers => }/api/common/helper_test.go | 0 pkg/{armhelpers => }/api/common/net.go | 0 pkg/{armhelpers => }/api/common/net_test.go | 0 pkg/{armhelpers => }/api/const.go | 0 pkg/{armhelpers => }/api/converterfromagentpoolonlyapi.go | 0 pkg/{armhelpers => }/api/converterfromapi.go | 0 pkg/{armhelpers => }/api/convertertoagentpoolonlyapi.go | 0 pkg/{armhelpers => }/api/convertertoagentpoolonlyapi_test.go | 0 pkg/{armhelpers => }/api/convertertoapi.go | 0 pkg/{armhelpers => }/api/convertertoapi_test.go | 0 pkg/{armhelpers => }/api/doc.go | 0 pkg/{armhelpers => }/api/orchestrators.go | 0 pkg/{armhelpers => }/api/orchestrators_test.go | 0 pkg/{armhelpers => }/api/strictjson.go | 0 pkg/{armhelpers => }/api/strictjson_test.go | 0 pkg/{armhelpers => }/api/types.go | 0 pkg/{armhelpers => }/api/types_test.go | 0 pkg/{armhelpers => }/api/v20160330/const.go | 0 pkg/{armhelpers => }/api/v20160330/doc.go | 0 pkg/{armhelpers => }/api/v20160330/merge.go | 0 pkg/{armhelpers => }/api/v20160330/merge_test.go | 0 pkg/{armhelpers => }/api/v20160330/types.go | 0 pkg/{armhelpers => }/api/v20160330/types_test.go | 0 pkg/{armhelpers => }/api/v20160330/validate.go | 0 pkg/{armhelpers => }/api/v20160930/const.go | 0 pkg/{armhelpers => }/api/v20160930/doc.go | 0 pkg/{armhelpers => }/api/v20160930/merge.go | 0 pkg/{armhelpers => }/api/v20160930/merge_test.go | 0 pkg/{armhelpers => }/api/v20160930/types.go | 0 pkg/{armhelpers => }/api/v20160930/types_test.go | 0 pkg/{armhelpers => }/api/v20160930/validate.go | 0 pkg/{armhelpers => }/api/v20170131/const.go | 0 pkg/{armhelpers => }/api/v20170131/doc.go | 0 pkg/{armhelpers => }/api/v20170131/merge.go | 0 pkg/{armhelpers => }/api/v20170131/merge_test.go | 0 pkg/{armhelpers => }/api/v20170131/types.go | 0 pkg/{armhelpers => }/api/v20170131/types_test.go | 0 pkg/{armhelpers => }/api/v20170131/validate.go | 0 pkg/{armhelpers => }/api/v20170131/validate_test.go | 0 pkg/{armhelpers => }/api/v20170701/const.go | 0 pkg/{armhelpers => }/api/v20170701/doc.go | 0 pkg/{armhelpers => }/api/v20170701/merge.go | 0 pkg/{armhelpers => }/api/v20170701/merge_test.go | 0 pkg/{armhelpers => }/api/v20170701/types.go | 0 pkg/{armhelpers => }/api/v20170701/types_test.go | 0 pkg/{armhelpers => }/api/v20170701/validate.go | 0 pkg/{armhelpers => }/api/v20170701/validate_test.go | 0 pkg/{armhelpers => }/api/v20170930/const.go | 0 pkg/{armhelpers => }/api/v20170930/types.go | 0 pkg/{armhelpers => }/api/v20170930/validate.go | 0 pkg/{armhelpers => }/api/vlabs/const.go | 0 pkg/{armhelpers => }/api/vlabs/doc.go | 0 pkg/{armhelpers => }/api/vlabs/merge.go | 0 pkg/{armhelpers => }/api/vlabs/merge_test.go | 0 pkg/{armhelpers => }/api/vlabs/orchestratorversiontypes.go | 0 pkg/{armhelpers => }/api/vlabs/types.go | 0 pkg/{armhelpers => }/api/vlabs/validate.go | 0 pkg/{armhelpers => }/api/vlabs/validate_test.go | 0 71 files changed, 0 insertions(+), 0 deletions(-) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/const.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/doc.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types_test.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/validate.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/const.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/doc.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types_test.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/validate.go (100%) rename pkg/{armhelpers => }/api/apiloader.go (100%) rename pkg/{armhelpers => }/api/common/const.go (100%) rename pkg/{armhelpers => }/api/common/helper.go (100%) rename pkg/{armhelpers => }/api/common/helper_test.go (100%) rename pkg/{armhelpers => }/api/common/net.go (100%) rename pkg/{armhelpers => }/api/common/net_test.go (100%) rename pkg/{armhelpers => }/api/const.go (100%) rename pkg/{armhelpers => }/api/converterfromagentpoolonlyapi.go (100%) rename pkg/{armhelpers => }/api/converterfromapi.go (100%) rename pkg/{armhelpers => }/api/convertertoagentpoolonlyapi.go (100%) rename pkg/{armhelpers => }/api/convertertoagentpoolonlyapi_test.go (100%) rename pkg/{armhelpers => }/api/convertertoapi.go (100%) rename pkg/{armhelpers => }/api/convertertoapi_test.go (100%) rename pkg/{armhelpers => }/api/doc.go (100%) rename pkg/{armhelpers => }/api/orchestrators.go (100%) rename pkg/{armhelpers => }/api/orchestrators_test.go (100%) rename pkg/{armhelpers => }/api/strictjson.go (100%) rename pkg/{armhelpers => }/api/strictjson_test.go (100%) rename pkg/{armhelpers => }/api/types.go (100%) rename pkg/{armhelpers => }/api/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/const.go (100%) rename pkg/{armhelpers => }/api/v20160330/doc.go (100%) rename pkg/{armhelpers => }/api/v20160330/merge.go (100%) rename pkg/{armhelpers => }/api/v20160330/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/types.go (100%) rename pkg/{armhelpers => }/api/v20160330/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/validate.go (100%) rename pkg/{armhelpers => }/api/v20160930/const.go (100%) rename pkg/{armhelpers => }/api/v20160930/doc.go (100%) rename pkg/{armhelpers => }/api/v20160930/merge.go (100%) rename pkg/{armhelpers => }/api/v20160930/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20160930/types.go (100%) rename pkg/{armhelpers => }/api/v20160930/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160930/validate.go (100%) rename pkg/{armhelpers => }/api/v20170131/const.go (100%) rename pkg/{armhelpers => }/api/v20170131/doc.go (100%) rename pkg/{armhelpers => }/api/v20170131/merge.go (100%) rename pkg/{armhelpers => }/api/v20170131/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20170131/types.go (100%) rename pkg/{armhelpers => }/api/v20170131/types_test.go (100%) rename pkg/{armhelpers => }/api/v20170131/validate.go (100%) rename pkg/{armhelpers => }/api/v20170131/validate_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/const.go (100%) rename pkg/{armhelpers => }/api/v20170701/doc.go (100%) rename pkg/{armhelpers => }/api/v20170701/merge.go (100%) rename pkg/{armhelpers => }/api/v20170701/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/types.go (100%) rename pkg/{armhelpers => }/api/v20170701/types_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/validate.go (100%) rename pkg/{armhelpers => }/api/v20170701/validate_test.go (100%) rename pkg/{armhelpers => }/api/v20170930/const.go (100%) rename pkg/{armhelpers => }/api/v20170930/types.go (100%) rename pkg/{armhelpers => }/api/v20170930/validate.go (100%) rename pkg/{armhelpers => }/api/vlabs/const.go (100%) rename pkg/{armhelpers => }/api/vlabs/doc.go (100%) rename pkg/{armhelpers => }/api/vlabs/merge.go (100%) rename pkg/{armhelpers => }/api/vlabs/merge_test.go (100%) rename pkg/{armhelpers => }/api/vlabs/orchestratorversiontypes.go (100%) rename pkg/{armhelpers => }/api/vlabs/types.go (100%) rename pkg/{armhelpers => }/api/vlabs/validate.go (100%) rename pkg/{armhelpers => }/api/vlabs/validate_test.go (100%) diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go b/pkg/api/agentPoolOnlyApi/v20170831/const.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go rename to pkg/api/agentPoolOnlyApi/v20170831/const.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go b/pkg/api/agentPoolOnlyApi/v20170831/doc.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go rename to pkg/api/agentPoolOnlyApi/v20170831/doc.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go b/pkg/api/agentPoolOnlyApi/v20170831/types.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go rename to pkg/api/agentPoolOnlyApi/v20170831/types.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go b/pkg/api/agentPoolOnlyApi/v20170831/types_test.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go rename to pkg/api/agentPoolOnlyApi/v20170831/types_test.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go b/pkg/api/agentPoolOnlyApi/v20170831/validate.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go rename to pkg/api/agentPoolOnlyApi/v20170831/validate.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go b/pkg/api/agentPoolOnlyApi/vlabs/const.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go rename to pkg/api/agentPoolOnlyApi/vlabs/const.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go b/pkg/api/agentPoolOnlyApi/vlabs/doc.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go rename to pkg/api/agentPoolOnlyApi/vlabs/doc.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go b/pkg/api/agentPoolOnlyApi/vlabs/types.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go rename to pkg/api/agentPoolOnlyApi/vlabs/types.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go b/pkg/api/agentPoolOnlyApi/vlabs/types_test.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go rename to pkg/api/agentPoolOnlyApi/vlabs/types_test.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go b/pkg/api/agentPoolOnlyApi/vlabs/validate.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go rename to pkg/api/agentPoolOnlyApi/vlabs/validate.go diff --git a/pkg/armhelpers/api/apiloader.go b/pkg/api/apiloader.go similarity index 100% rename from pkg/armhelpers/api/apiloader.go rename to pkg/api/apiloader.go diff --git a/pkg/armhelpers/api/common/const.go b/pkg/api/common/const.go similarity index 100% rename from pkg/armhelpers/api/common/const.go rename to pkg/api/common/const.go diff --git a/pkg/armhelpers/api/common/helper.go b/pkg/api/common/helper.go similarity index 100% rename from pkg/armhelpers/api/common/helper.go rename to pkg/api/common/helper.go diff --git a/pkg/armhelpers/api/common/helper_test.go b/pkg/api/common/helper_test.go similarity index 100% rename from pkg/armhelpers/api/common/helper_test.go rename to pkg/api/common/helper_test.go diff --git a/pkg/armhelpers/api/common/net.go b/pkg/api/common/net.go similarity index 100% rename from pkg/armhelpers/api/common/net.go rename to pkg/api/common/net.go diff --git a/pkg/armhelpers/api/common/net_test.go b/pkg/api/common/net_test.go similarity index 100% rename from pkg/armhelpers/api/common/net_test.go rename to pkg/api/common/net_test.go diff --git a/pkg/armhelpers/api/const.go b/pkg/api/const.go similarity index 100% rename from pkg/armhelpers/api/const.go rename to pkg/api/const.go diff --git a/pkg/armhelpers/api/converterfromagentpoolonlyapi.go b/pkg/api/converterfromagentpoolonlyapi.go similarity index 100% rename from pkg/armhelpers/api/converterfromagentpoolonlyapi.go rename to pkg/api/converterfromagentpoolonlyapi.go diff --git a/pkg/armhelpers/api/converterfromapi.go b/pkg/api/converterfromapi.go similarity index 100% rename from pkg/armhelpers/api/converterfromapi.go rename to pkg/api/converterfromapi.go diff --git a/pkg/armhelpers/api/convertertoagentpoolonlyapi.go b/pkg/api/convertertoagentpoolonlyapi.go similarity index 100% rename from pkg/armhelpers/api/convertertoagentpoolonlyapi.go rename to pkg/api/convertertoagentpoolonlyapi.go diff --git a/pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go b/pkg/api/convertertoagentpoolonlyapi_test.go similarity index 100% rename from pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go rename to pkg/api/convertertoagentpoolonlyapi_test.go diff --git a/pkg/armhelpers/api/convertertoapi.go b/pkg/api/convertertoapi.go similarity index 100% rename from pkg/armhelpers/api/convertertoapi.go rename to pkg/api/convertertoapi.go diff --git a/pkg/armhelpers/api/convertertoapi_test.go b/pkg/api/convertertoapi_test.go similarity index 100% rename from pkg/armhelpers/api/convertertoapi_test.go rename to pkg/api/convertertoapi_test.go diff --git a/pkg/armhelpers/api/doc.go b/pkg/api/doc.go similarity index 100% rename from pkg/armhelpers/api/doc.go rename to pkg/api/doc.go diff --git a/pkg/armhelpers/api/orchestrators.go b/pkg/api/orchestrators.go similarity index 100% rename from pkg/armhelpers/api/orchestrators.go rename to pkg/api/orchestrators.go diff --git a/pkg/armhelpers/api/orchestrators_test.go b/pkg/api/orchestrators_test.go similarity index 100% rename from pkg/armhelpers/api/orchestrators_test.go rename to pkg/api/orchestrators_test.go diff --git a/pkg/armhelpers/api/strictjson.go b/pkg/api/strictjson.go similarity index 100% rename from pkg/armhelpers/api/strictjson.go rename to pkg/api/strictjson.go diff --git a/pkg/armhelpers/api/strictjson_test.go b/pkg/api/strictjson_test.go similarity index 100% rename from pkg/armhelpers/api/strictjson_test.go rename to pkg/api/strictjson_test.go diff --git a/pkg/armhelpers/api/types.go b/pkg/api/types.go similarity index 100% rename from pkg/armhelpers/api/types.go rename to pkg/api/types.go diff --git a/pkg/armhelpers/api/types_test.go b/pkg/api/types_test.go similarity index 100% rename from pkg/armhelpers/api/types_test.go rename to pkg/api/types_test.go diff --git a/pkg/armhelpers/api/v20160330/const.go b/pkg/api/v20160330/const.go similarity index 100% rename from pkg/armhelpers/api/v20160330/const.go rename to pkg/api/v20160330/const.go diff --git a/pkg/armhelpers/api/v20160330/doc.go b/pkg/api/v20160330/doc.go similarity index 100% rename from pkg/armhelpers/api/v20160330/doc.go rename to pkg/api/v20160330/doc.go diff --git a/pkg/armhelpers/api/v20160330/merge.go b/pkg/api/v20160330/merge.go similarity index 100% rename from pkg/armhelpers/api/v20160330/merge.go rename to pkg/api/v20160330/merge.go diff --git a/pkg/armhelpers/api/v20160330/merge_test.go b/pkg/api/v20160330/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20160330/merge_test.go rename to pkg/api/v20160330/merge_test.go diff --git a/pkg/armhelpers/api/v20160330/types.go b/pkg/api/v20160330/types.go similarity index 100% rename from pkg/armhelpers/api/v20160330/types.go rename to pkg/api/v20160330/types.go diff --git a/pkg/armhelpers/api/v20160330/types_test.go b/pkg/api/v20160330/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20160330/types_test.go rename to pkg/api/v20160330/types_test.go diff --git a/pkg/armhelpers/api/v20160330/validate.go b/pkg/api/v20160330/validate.go similarity index 100% rename from pkg/armhelpers/api/v20160330/validate.go rename to pkg/api/v20160330/validate.go diff --git a/pkg/armhelpers/api/v20160930/const.go b/pkg/api/v20160930/const.go similarity index 100% rename from pkg/armhelpers/api/v20160930/const.go rename to pkg/api/v20160930/const.go diff --git a/pkg/armhelpers/api/v20160930/doc.go b/pkg/api/v20160930/doc.go similarity index 100% rename from pkg/armhelpers/api/v20160930/doc.go rename to pkg/api/v20160930/doc.go diff --git a/pkg/armhelpers/api/v20160930/merge.go b/pkg/api/v20160930/merge.go similarity index 100% rename from pkg/armhelpers/api/v20160930/merge.go rename to pkg/api/v20160930/merge.go diff --git a/pkg/armhelpers/api/v20160930/merge_test.go b/pkg/api/v20160930/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20160930/merge_test.go rename to pkg/api/v20160930/merge_test.go diff --git a/pkg/armhelpers/api/v20160930/types.go b/pkg/api/v20160930/types.go similarity index 100% rename from pkg/armhelpers/api/v20160930/types.go rename to pkg/api/v20160930/types.go diff --git a/pkg/armhelpers/api/v20160930/types_test.go b/pkg/api/v20160930/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20160930/types_test.go rename to pkg/api/v20160930/types_test.go diff --git a/pkg/armhelpers/api/v20160930/validate.go b/pkg/api/v20160930/validate.go similarity index 100% rename from pkg/armhelpers/api/v20160930/validate.go rename to pkg/api/v20160930/validate.go diff --git a/pkg/armhelpers/api/v20170131/const.go b/pkg/api/v20170131/const.go similarity index 100% rename from pkg/armhelpers/api/v20170131/const.go rename to pkg/api/v20170131/const.go diff --git a/pkg/armhelpers/api/v20170131/doc.go b/pkg/api/v20170131/doc.go similarity index 100% rename from pkg/armhelpers/api/v20170131/doc.go rename to pkg/api/v20170131/doc.go diff --git a/pkg/armhelpers/api/v20170131/merge.go b/pkg/api/v20170131/merge.go similarity index 100% rename from pkg/armhelpers/api/v20170131/merge.go rename to pkg/api/v20170131/merge.go diff --git a/pkg/armhelpers/api/v20170131/merge_test.go b/pkg/api/v20170131/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/merge_test.go rename to pkg/api/v20170131/merge_test.go diff --git a/pkg/armhelpers/api/v20170131/types.go b/pkg/api/v20170131/types.go similarity index 100% rename from pkg/armhelpers/api/v20170131/types.go rename to pkg/api/v20170131/types.go diff --git a/pkg/armhelpers/api/v20170131/types_test.go b/pkg/api/v20170131/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/types_test.go rename to pkg/api/v20170131/types_test.go diff --git a/pkg/armhelpers/api/v20170131/validate.go b/pkg/api/v20170131/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170131/validate.go rename to pkg/api/v20170131/validate.go diff --git a/pkg/armhelpers/api/v20170131/validate_test.go b/pkg/api/v20170131/validate_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/validate_test.go rename to pkg/api/v20170131/validate_test.go diff --git a/pkg/armhelpers/api/v20170701/const.go b/pkg/api/v20170701/const.go similarity index 100% rename from pkg/armhelpers/api/v20170701/const.go rename to pkg/api/v20170701/const.go diff --git a/pkg/armhelpers/api/v20170701/doc.go b/pkg/api/v20170701/doc.go similarity index 100% rename from pkg/armhelpers/api/v20170701/doc.go rename to pkg/api/v20170701/doc.go diff --git a/pkg/armhelpers/api/v20170701/merge.go b/pkg/api/v20170701/merge.go similarity index 100% rename from pkg/armhelpers/api/v20170701/merge.go rename to pkg/api/v20170701/merge.go diff --git a/pkg/armhelpers/api/v20170701/merge_test.go b/pkg/api/v20170701/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/merge_test.go rename to pkg/api/v20170701/merge_test.go diff --git a/pkg/armhelpers/api/v20170701/types.go b/pkg/api/v20170701/types.go similarity index 100% rename from pkg/armhelpers/api/v20170701/types.go rename to pkg/api/v20170701/types.go diff --git a/pkg/armhelpers/api/v20170701/types_test.go b/pkg/api/v20170701/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/types_test.go rename to pkg/api/v20170701/types_test.go diff --git a/pkg/armhelpers/api/v20170701/validate.go b/pkg/api/v20170701/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170701/validate.go rename to pkg/api/v20170701/validate.go diff --git a/pkg/armhelpers/api/v20170701/validate_test.go b/pkg/api/v20170701/validate_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/validate_test.go rename to pkg/api/v20170701/validate_test.go diff --git a/pkg/armhelpers/api/v20170930/const.go b/pkg/api/v20170930/const.go similarity index 100% rename from pkg/armhelpers/api/v20170930/const.go rename to pkg/api/v20170930/const.go diff --git a/pkg/armhelpers/api/v20170930/types.go b/pkg/api/v20170930/types.go similarity index 100% rename from pkg/armhelpers/api/v20170930/types.go rename to pkg/api/v20170930/types.go diff --git a/pkg/armhelpers/api/v20170930/validate.go b/pkg/api/v20170930/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170930/validate.go rename to pkg/api/v20170930/validate.go diff --git a/pkg/armhelpers/api/vlabs/const.go b/pkg/api/vlabs/const.go similarity index 100% rename from pkg/armhelpers/api/vlabs/const.go rename to pkg/api/vlabs/const.go diff --git a/pkg/armhelpers/api/vlabs/doc.go b/pkg/api/vlabs/doc.go similarity index 100% rename from pkg/armhelpers/api/vlabs/doc.go rename to pkg/api/vlabs/doc.go diff --git a/pkg/armhelpers/api/vlabs/merge.go b/pkg/api/vlabs/merge.go similarity index 100% rename from pkg/armhelpers/api/vlabs/merge.go rename to pkg/api/vlabs/merge.go diff --git a/pkg/armhelpers/api/vlabs/merge_test.go b/pkg/api/vlabs/merge_test.go similarity index 100% rename from pkg/armhelpers/api/vlabs/merge_test.go rename to pkg/api/vlabs/merge_test.go diff --git a/pkg/armhelpers/api/vlabs/orchestratorversiontypes.go b/pkg/api/vlabs/orchestratorversiontypes.go similarity index 100% rename from pkg/armhelpers/api/vlabs/orchestratorversiontypes.go rename to pkg/api/vlabs/orchestratorversiontypes.go diff --git a/pkg/armhelpers/api/vlabs/types.go b/pkg/api/vlabs/types.go similarity index 100% rename from pkg/armhelpers/api/vlabs/types.go rename to pkg/api/vlabs/types.go diff --git a/pkg/armhelpers/api/vlabs/validate.go b/pkg/api/vlabs/validate.go similarity index 100% rename from pkg/armhelpers/api/vlabs/validate.go rename to pkg/api/vlabs/validate.go diff --git a/pkg/armhelpers/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go similarity index 100% rename from pkg/armhelpers/api/vlabs/validate_test.go rename to pkg/api/vlabs/validate_test.go From afb09d7cbb80f2a33643d7c9f30cff1c0cc214d4 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 26 Oct 2017 10:11:29 -0700 Subject: [PATCH 09/24] merge master upstream --- pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/const.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/doc.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types_test.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/validate.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/const.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/doc.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types_test.go | 0 pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/validate.go | 0 pkg/{ => armhelpers}/api/apiloader.go | 0 pkg/{ => armhelpers}/api/common/const.go | 0 pkg/{ => armhelpers}/api/common/helper.go | 0 pkg/{ => armhelpers}/api/common/helper_test.go | 0 pkg/{ => armhelpers}/api/common/net.go | 0 pkg/{ => armhelpers}/api/common/net_test.go | 0 pkg/{ => armhelpers}/api/const.go | 0 pkg/{ => armhelpers}/api/converterfromagentpoolonlyapi.go | 0 pkg/{ => armhelpers}/api/converterfromapi.go | 0 pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi.go | 0 pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi_test.go | 0 pkg/{ => armhelpers}/api/convertertoapi.go | 0 pkg/{ => armhelpers}/api/convertertoapi_test.go | 0 pkg/{ => armhelpers}/api/doc.go | 0 pkg/{ => armhelpers}/api/orchestrators.go | 0 pkg/{ => armhelpers}/api/orchestrators_test.go | 0 pkg/{ => armhelpers}/api/strictjson.go | 0 pkg/{ => armhelpers}/api/strictjson_test.go | 0 pkg/{ => armhelpers}/api/types.go | 0 pkg/{ => armhelpers}/api/types_test.go | 0 pkg/{ => armhelpers}/api/v20160330/const.go | 0 pkg/{ => armhelpers}/api/v20160330/doc.go | 0 pkg/{ => armhelpers}/api/v20160330/merge.go | 0 pkg/{ => armhelpers}/api/v20160330/merge_test.go | 0 pkg/{ => armhelpers}/api/v20160330/types.go | 0 pkg/{ => armhelpers}/api/v20160330/types_test.go | 0 pkg/{ => armhelpers}/api/v20160330/validate.go | 0 pkg/{ => armhelpers}/api/v20160930/const.go | 0 pkg/{ => armhelpers}/api/v20160930/doc.go | 0 pkg/{ => armhelpers}/api/v20160930/merge.go | 0 pkg/{ => armhelpers}/api/v20160930/merge_test.go | 0 pkg/{ => armhelpers}/api/v20160930/types.go | 0 pkg/{ => armhelpers}/api/v20160930/types_test.go | 0 pkg/{ => armhelpers}/api/v20160930/validate.go | 0 pkg/{ => armhelpers}/api/v20170131/const.go | 0 pkg/{ => armhelpers}/api/v20170131/doc.go | 0 pkg/{ => armhelpers}/api/v20170131/merge.go | 0 pkg/{ => armhelpers}/api/v20170131/merge_test.go | 0 pkg/{ => armhelpers}/api/v20170131/types.go | 0 pkg/{ => armhelpers}/api/v20170131/types_test.go | 0 pkg/{ => armhelpers}/api/v20170131/validate.go | 0 pkg/{ => armhelpers}/api/v20170131/validate_test.go | 0 pkg/{ => armhelpers}/api/v20170701/const.go | 0 pkg/{ => armhelpers}/api/v20170701/doc.go | 0 pkg/{ => armhelpers}/api/v20170701/merge.go | 0 pkg/{ => armhelpers}/api/v20170701/merge_test.go | 0 pkg/{ => armhelpers}/api/v20170701/types.go | 0 pkg/{ => armhelpers}/api/v20170701/types_test.go | 0 pkg/{ => armhelpers}/api/v20170701/validate.go | 0 pkg/{ => armhelpers}/api/v20170701/validate_test.go | 0 pkg/{ => armhelpers}/api/v20170930/const.go | 0 pkg/{ => armhelpers}/api/v20170930/types.go | 0 pkg/{ => armhelpers}/api/v20170930/validate.go | 0 pkg/{ => armhelpers}/api/vlabs/const.go | 0 pkg/{ => armhelpers}/api/vlabs/doc.go | 0 pkg/{ => armhelpers}/api/vlabs/merge.go | 0 pkg/{ => armhelpers}/api/vlabs/merge_test.go | 0 pkg/{ => armhelpers}/api/vlabs/orchestratorversiontypes.go | 0 pkg/{ => armhelpers}/api/vlabs/types.go | 0 pkg/{ => armhelpers}/api/vlabs/validate.go | 0 pkg/{ => armhelpers}/api/vlabs/validate_test.go | 0 71 files changed, 0 insertions(+), 0 deletions(-) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/const.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/doc.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/types_test.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/v20170831/validate.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/const.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/doc.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/types_test.go (100%) rename pkg/{ => armhelpers}/api/agentPoolOnlyApi/vlabs/validate.go (100%) rename pkg/{ => armhelpers}/api/apiloader.go (100%) rename pkg/{ => armhelpers}/api/common/const.go (100%) rename pkg/{ => armhelpers}/api/common/helper.go (100%) rename pkg/{ => armhelpers}/api/common/helper_test.go (100%) rename pkg/{ => armhelpers}/api/common/net.go (100%) rename pkg/{ => armhelpers}/api/common/net_test.go (100%) rename pkg/{ => armhelpers}/api/const.go (100%) rename pkg/{ => armhelpers}/api/converterfromagentpoolonlyapi.go (100%) rename pkg/{ => armhelpers}/api/converterfromapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoagentpoolonlyapi_test.go (100%) rename pkg/{ => armhelpers}/api/convertertoapi.go (100%) rename pkg/{ => armhelpers}/api/convertertoapi_test.go (100%) rename pkg/{ => armhelpers}/api/doc.go (100%) rename pkg/{ => armhelpers}/api/orchestrators.go (100%) rename pkg/{ => armhelpers}/api/orchestrators_test.go (100%) rename pkg/{ => armhelpers}/api/strictjson.go (100%) rename pkg/{ => armhelpers}/api/strictjson_test.go (100%) rename pkg/{ => armhelpers}/api/types.go (100%) rename pkg/{ => armhelpers}/api/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/const.go (100%) rename pkg/{ => armhelpers}/api/v20160330/doc.go (100%) rename pkg/{ => armhelpers}/api/v20160330/merge.go (100%) rename pkg/{ => armhelpers}/api/v20160330/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/types.go (100%) rename pkg/{ => armhelpers}/api/v20160330/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160330/validate.go (100%) rename pkg/{ => armhelpers}/api/v20160930/const.go (100%) rename pkg/{ => armhelpers}/api/v20160930/doc.go (100%) rename pkg/{ => armhelpers}/api/v20160930/merge.go (100%) rename pkg/{ => armhelpers}/api/v20160930/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20160930/types.go (100%) rename pkg/{ => armhelpers}/api/v20160930/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20160930/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170131/const.go (100%) rename pkg/{ => armhelpers}/api/v20170131/doc.go (100%) rename pkg/{ => armhelpers}/api/v20170131/merge.go (100%) rename pkg/{ => armhelpers}/api/v20170131/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20170131/types.go (100%) rename pkg/{ => armhelpers}/api/v20170131/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20170131/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170131/validate_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/const.go (100%) rename pkg/{ => armhelpers}/api/v20170701/doc.go (100%) rename pkg/{ => armhelpers}/api/v20170701/merge.go (100%) rename pkg/{ => armhelpers}/api/v20170701/merge_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/types.go (100%) rename pkg/{ => armhelpers}/api/v20170701/types_test.go (100%) rename pkg/{ => armhelpers}/api/v20170701/validate.go (100%) rename pkg/{ => armhelpers}/api/v20170701/validate_test.go (100%) rename pkg/{ => armhelpers}/api/v20170930/const.go (100%) rename pkg/{ => armhelpers}/api/v20170930/types.go (100%) rename pkg/{ => armhelpers}/api/v20170930/validate.go (100%) rename pkg/{ => armhelpers}/api/vlabs/const.go (100%) rename pkg/{ => armhelpers}/api/vlabs/doc.go (100%) rename pkg/{ => armhelpers}/api/vlabs/merge.go (100%) rename pkg/{ => armhelpers}/api/vlabs/merge_test.go (100%) rename pkg/{ => armhelpers}/api/vlabs/orchestratorversiontypes.go (100%) rename pkg/{ => armhelpers}/api/vlabs/types.go (100%) rename pkg/{ => armhelpers}/api/vlabs/validate.go (100%) rename pkg/{ => armhelpers}/api/vlabs/validate_test.go (100%) diff --git a/pkg/api/agentPoolOnlyApi/v20170831/const.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/const.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/doc.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/doc.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/types.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/types.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/types_test.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/types_test.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go diff --git a/pkg/api/agentPoolOnlyApi/v20170831/validate.go b/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/v20170831/validate.go rename to pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/const.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/const.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/doc.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/doc.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/types.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/types.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/types_test.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/types_test.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go diff --git a/pkg/api/agentPoolOnlyApi/vlabs/validate.go b/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go similarity index 100% rename from pkg/api/agentPoolOnlyApi/vlabs/validate.go rename to pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go diff --git a/pkg/api/apiloader.go b/pkg/armhelpers/api/apiloader.go similarity index 100% rename from pkg/api/apiloader.go rename to pkg/armhelpers/api/apiloader.go diff --git a/pkg/api/common/const.go b/pkg/armhelpers/api/common/const.go similarity index 100% rename from pkg/api/common/const.go rename to pkg/armhelpers/api/common/const.go diff --git a/pkg/api/common/helper.go b/pkg/armhelpers/api/common/helper.go similarity index 100% rename from pkg/api/common/helper.go rename to pkg/armhelpers/api/common/helper.go diff --git a/pkg/api/common/helper_test.go b/pkg/armhelpers/api/common/helper_test.go similarity index 100% rename from pkg/api/common/helper_test.go rename to pkg/armhelpers/api/common/helper_test.go diff --git a/pkg/api/common/net.go b/pkg/armhelpers/api/common/net.go similarity index 100% rename from pkg/api/common/net.go rename to pkg/armhelpers/api/common/net.go diff --git a/pkg/api/common/net_test.go b/pkg/armhelpers/api/common/net_test.go similarity index 100% rename from pkg/api/common/net_test.go rename to pkg/armhelpers/api/common/net_test.go diff --git a/pkg/api/const.go b/pkg/armhelpers/api/const.go similarity index 100% rename from pkg/api/const.go rename to pkg/armhelpers/api/const.go diff --git a/pkg/api/converterfromagentpoolonlyapi.go b/pkg/armhelpers/api/converterfromagentpoolonlyapi.go similarity index 100% rename from pkg/api/converterfromagentpoolonlyapi.go rename to pkg/armhelpers/api/converterfromagentpoolonlyapi.go diff --git a/pkg/api/converterfromapi.go b/pkg/armhelpers/api/converterfromapi.go similarity index 100% rename from pkg/api/converterfromapi.go rename to pkg/armhelpers/api/converterfromapi.go diff --git a/pkg/api/convertertoagentpoolonlyapi.go b/pkg/armhelpers/api/convertertoagentpoolonlyapi.go similarity index 100% rename from pkg/api/convertertoagentpoolonlyapi.go rename to pkg/armhelpers/api/convertertoagentpoolonlyapi.go diff --git a/pkg/api/convertertoagentpoolonlyapi_test.go b/pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go similarity index 100% rename from pkg/api/convertertoagentpoolonlyapi_test.go rename to pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go diff --git a/pkg/api/convertertoapi.go b/pkg/armhelpers/api/convertertoapi.go similarity index 100% rename from pkg/api/convertertoapi.go rename to pkg/armhelpers/api/convertertoapi.go diff --git a/pkg/api/convertertoapi_test.go b/pkg/armhelpers/api/convertertoapi_test.go similarity index 100% rename from pkg/api/convertertoapi_test.go rename to pkg/armhelpers/api/convertertoapi_test.go diff --git a/pkg/api/doc.go b/pkg/armhelpers/api/doc.go similarity index 100% rename from pkg/api/doc.go rename to pkg/armhelpers/api/doc.go diff --git a/pkg/api/orchestrators.go b/pkg/armhelpers/api/orchestrators.go similarity index 100% rename from pkg/api/orchestrators.go rename to pkg/armhelpers/api/orchestrators.go diff --git a/pkg/api/orchestrators_test.go b/pkg/armhelpers/api/orchestrators_test.go similarity index 100% rename from pkg/api/orchestrators_test.go rename to pkg/armhelpers/api/orchestrators_test.go diff --git a/pkg/api/strictjson.go b/pkg/armhelpers/api/strictjson.go similarity index 100% rename from pkg/api/strictjson.go rename to pkg/armhelpers/api/strictjson.go diff --git a/pkg/api/strictjson_test.go b/pkg/armhelpers/api/strictjson_test.go similarity index 100% rename from pkg/api/strictjson_test.go rename to pkg/armhelpers/api/strictjson_test.go diff --git a/pkg/api/types.go b/pkg/armhelpers/api/types.go similarity index 100% rename from pkg/api/types.go rename to pkg/armhelpers/api/types.go diff --git a/pkg/api/types_test.go b/pkg/armhelpers/api/types_test.go similarity index 100% rename from pkg/api/types_test.go rename to pkg/armhelpers/api/types_test.go diff --git a/pkg/api/v20160330/const.go b/pkg/armhelpers/api/v20160330/const.go similarity index 100% rename from pkg/api/v20160330/const.go rename to pkg/armhelpers/api/v20160330/const.go diff --git a/pkg/api/v20160330/doc.go b/pkg/armhelpers/api/v20160330/doc.go similarity index 100% rename from pkg/api/v20160330/doc.go rename to pkg/armhelpers/api/v20160330/doc.go diff --git a/pkg/api/v20160330/merge.go b/pkg/armhelpers/api/v20160330/merge.go similarity index 100% rename from pkg/api/v20160330/merge.go rename to pkg/armhelpers/api/v20160330/merge.go diff --git a/pkg/api/v20160330/merge_test.go b/pkg/armhelpers/api/v20160330/merge_test.go similarity index 100% rename from pkg/api/v20160330/merge_test.go rename to pkg/armhelpers/api/v20160330/merge_test.go diff --git a/pkg/api/v20160330/types.go b/pkg/armhelpers/api/v20160330/types.go similarity index 100% rename from pkg/api/v20160330/types.go rename to pkg/armhelpers/api/v20160330/types.go diff --git a/pkg/api/v20160330/types_test.go b/pkg/armhelpers/api/v20160330/types_test.go similarity index 100% rename from pkg/api/v20160330/types_test.go rename to pkg/armhelpers/api/v20160330/types_test.go diff --git a/pkg/api/v20160330/validate.go b/pkg/armhelpers/api/v20160330/validate.go similarity index 100% rename from pkg/api/v20160330/validate.go rename to pkg/armhelpers/api/v20160330/validate.go diff --git a/pkg/api/v20160930/const.go b/pkg/armhelpers/api/v20160930/const.go similarity index 100% rename from pkg/api/v20160930/const.go rename to pkg/armhelpers/api/v20160930/const.go diff --git a/pkg/api/v20160930/doc.go b/pkg/armhelpers/api/v20160930/doc.go similarity index 100% rename from pkg/api/v20160930/doc.go rename to pkg/armhelpers/api/v20160930/doc.go diff --git a/pkg/api/v20160930/merge.go b/pkg/armhelpers/api/v20160930/merge.go similarity index 100% rename from pkg/api/v20160930/merge.go rename to pkg/armhelpers/api/v20160930/merge.go diff --git a/pkg/api/v20160930/merge_test.go b/pkg/armhelpers/api/v20160930/merge_test.go similarity index 100% rename from pkg/api/v20160930/merge_test.go rename to pkg/armhelpers/api/v20160930/merge_test.go diff --git a/pkg/api/v20160930/types.go b/pkg/armhelpers/api/v20160930/types.go similarity index 100% rename from pkg/api/v20160930/types.go rename to pkg/armhelpers/api/v20160930/types.go diff --git a/pkg/api/v20160930/types_test.go b/pkg/armhelpers/api/v20160930/types_test.go similarity index 100% rename from pkg/api/v20160930/types_test.go rename to pkg/armhelpers/api/v20160930/types_test.go diff --git a/pkg/api/v20160930/validate.go b/pkg/armhelpers/api/v20160930/validate.go similarity index 100% rename from pkg/api/v20160930/validate.go rename to pkg/armhelpers/api/v20160930/validate.go diff --git a/pkg/api/v20170131/const.go b/pkg/armhelpers/api/v20170131/const.go similarity index 100% rename from pkg/api/v20170131/const.go rename to pkg/armhelpers/api/v20170131/const.go diff --git a/pkg/api/v20170131/doc.go b/pkg/armhelpers/api/v20170131/doc.go similarity index 100% rename from pkg/api/v20170131/doc.go rename to pkg/armhelpers/api/v20170131/doc.go diff --git a/pkg/api/v20170131/merge.go b/pkg/armhelpers/api/v20170131/merge.go similarity index 100% rename from pkg/api/v20170131/merge.go rename to pkg/armhelpers/api/v20170131/merge.go diff --git a/pkg/api/v20170131/merge_test.go b/pkg/armhelpers/api/v20170131/merge_test.go similarity index 100% rename from pkg/api/v20170131/merge_test.go rename to pkg/armhelpers/api/v20170131/merge_test.go diff --git a/pkg/api/v20170131/types.go b/pkg/armhelpers/api/v20170131/types.go similarity index 100% rename from pkg/api/v20170131/types.go rename to pkg/armhelpers/api/v20170131/types.go diff --git a/pkg/api/v20170131/types_test.go b/pkg/armhelpers/api/v20170131/types_test.go similarity index 100% rename from pkg/api/v20170131/types_test.go rename to pkg/armhelpers/api/v20170131/types_test.go diff --git a/pkg/api/v20170131/validate.go b/pkg/armhelpers/api/v20170131/validate.go similarity index 100% rename from pkg/api/v20170131/validate.go rename to pkg/armhelpers/api/v20170131/validate.go diff --git a/pkg/api/v20170131/validate_test.go b/pkg/armhelpers/api/v20170131/validate_test.go similarity index 100% rename from pkg/api/v20170131/validate_test.go rename to pkg/armhelpers/api/v20170131/validate_test.go diff --git a/pkg/api/v20170701/const.go b/pkg/armhelpers/api/v20170701/const.go similarity index 100% rename from pkg/api/v20170701/const.go rename to pkg/armhelpers/api/v20170701/const.go diff --git a/pkg/api/v20170701/doc.go b/pkg/armhelpers/api/v20170701/doc.go similarity index 100% rename from pkg/api/v20170701/doc.go rename to pkg/armhelpers/api/v20170701/doc.go diff --git a/pkg/api/v20170701/merge.go b/pkg/armhelpers/api/v20170701/merge.go similarity index 100% rename from pkg/api/v20170701/merge.go rename to pkg/armhelpers/api/v20170701/merge.go diff --git a/pkg/api/v20170701/merge_test.go b/pkg/armhelpers/api/v20170701/merge_test.go similarity index 100% rename from pkg/api/v20170701/merge_test.go rename to pkg/armhelpers/api/v20170701/merge_test.go diff --git a/pkg/api/v20170701/types.go b/pkg/armhelpers/api/v20170701/types.go similarity index 100% rename from pkg/api/v20170701/types.go rename to pkg/armhelpers/api/v20170701/types.go diff --git a/pkg/api/v20170701/types_test.go b/pkg/armhelpers/api/v20170701/types_test.go similarity index 100% rename from pkg/api/v20170701/types_test.go rename to pkg/armhelpers/api/v20170701/types_test.go diff --git a/pkg/api/v20170701/validate.go b/pkg/armhelpers/api/v20170701/validate.go similarity index 100% rename from pkg/api/v20170701/validate.go rename to pkg/armhelpers/api/v20170701/validate.go diff --git a/pkg/api/v20170701/validate_test.go b/pkg/armhelpers/api/v20170701/validate_test.go similarity index 100% rename from pkg/api/v20170701/validate_test.go rename to pkg/armhelpers/api/v20170701/validate_test.go diff --git a/pkg/api/v20170930/const.go b/pkg/armhelpers/api/v20170930/const.go similarity index 100% rename from pkg/api/v20170930/const.go rename to pkg/armhelpers/api/v20170930/const.go diff --git a/pkg/api/v20170930/types.go b/pkg/armhelpers/api/v20170930/types.go similarity index 100% rename from pkg/api/v20170930/types.go rename to pkg/armhelpers/api/v20170930/types.go diff --git a/pkg/api/v20170930/validate.go b/pkg/armhelpers/api/v20170930/validate.go similarity index 100% rename from pkg/api/v20170930/validate.go rename to pkg/armhelpers/api/v20170930/validate.go diff --git a/pkg/api/vlabs/const.go b/pkg/armhelpers/api/vlabs/const.go similarity index 100% rename from pkg/api/vlabs/const.go rename to pkg/armhelpers/api/vlabs/const.go diff --git a/pkg/api/vlabs/doc.go b/pkg/armhelpers/api/vlabs/doc.go similarity index 100% rename from pkg/api/vlabs/doc.go rename to pkg/armhelpers/api/vlabs/doc.go diff --git a/pkg/api/vlabs/merge.go b/pkg/armhelpers/api/vlabs/merge.go similarity index 100% rename from pkg/api/vlabs/merge.go rename to pkg/armhelpers/api/vlabs/merge.go diff --git a/pkg/api/vlabs/merge_test.go b/pkg/armhelpers/api/vlabs/merge_test.go similarity index 100% rename from pkg/api/vlabs/merge_test.go rename to pkg/armhelpers/api/vlabs/merge_test.go diff --git a/pkg/api/vlabs/orchestratorversiontypes.go b/pkg/armhelpers/api/vlabs/orchestratorversiontypes.go similarity index 100% rename from pkg/api/vlabs/orchestratorversiontypes.go rename to pkg/armhelpers/api/vlabs/orchestratorversiontypes.go diff --git a/pkg/api/vlabs/types.go b/pkg/armhelpers/api/vlabs/types.go similarity index 100% rename from pkg/api/vlabs/types.go rename to pkg/armhelpers/api/vlabs/types.go diff --git a/pkg/api/vlabs/validate.go b/pkg/armhelpers/api/vlabs/validate.go similarity index 100% rename from pkg/api/vlabs/validate.go rename to pkg/armhelpers/api/vlabs/validate.go diff --git a/pkg/api/vlabs/validate_test.go b/pkg/armhelpers/api/vlabs/validate_test.go similarity index 100% rename from pkg/api/vlabs/validate_test.go rename to pkg/armhelpers/api/vlabs/validate_test.go From 5bdf726f8a061f1532f4e445a4c75b585fc0d987 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 26 Oct 2017 10:14:20 -0700 Subject: [PATCH 10/24] Revert "merge master upstream" This reverts commit ab8d33d28a2b5e9a419e0018c9fee82b0134b11e. --- pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/const.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/doc.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types_test.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/validate.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/const.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/doc.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types_test.go | 0 pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/validate.go | 0 pkg/{armhelpers => }/api/apiloader.go | 0 pkg/{armhelpers => }/api/common/const.go | 0 pkg/{armhelpers => }/api/common/helper.go | 0 pkg/{armhelpers => }/api/common/helper_test.go | 0 pkg/{armhelpers => }/api/common/net.go | 0 pkg/{armhelpers => }/api/common/net_test.go | 0 pkg/{armhelpers => }/api/const.go | 0 pkg/{armhelpers => }/api/converterfromagentpoolonlyapi.go | 0 pkg/{armhelpers => }/api/converterfromapi.go | 0 pkg/{armhelpers => }/api/convertertoagentpoolonlyapi.go | 0 pkg/{armhelpers => }/api/convertertoagentpoolonlyapi_test.go | 0 pkg/{armhelpers => }/api/convertertoapi.go | 0 pkg/{armhelpers => }/api/convertertoapi_test.go | 0 pkg/{armhelpers => }/api/doc.go | 0 pkg/{armhelpers => }/api/orchestrators.go | 0 pkg/{armhelpers => }/api/orchestrators_test.go | 0 pkg/{armhelpers => }/api/strictjson.go | 0 pkg/{armhelpers => }/api/strictjson_test.go | 0 pkg/{armhelpers => }/api/types.go | 0 pkg/{armhelpers => }/api/types_test.go | 0 pkg/{armhelpers => }/api/v20160330/const.go | 0 pkg/{armhelpers => }/api/v20160330/doc.go | 0 pkg/{armhelpers => }/api/v20160330/merge.go | 0 pkg/{armhelpers => }/api/v20160330/merge_test.go | 0 pkg/{armhelpers => }/api/v20160330/types.go | 0 pkg/{armhelpers => }/api/v20160330/types_test.go | 0 pkg/{armhelpers => }/api/v20160330/validate.go | 0 pkg/{armhelpers => }/api/v20160930/const.go | 0 pkg/{armhelpers => }/api/v20160930/doc.go | 0 pkg/{armhelpers => }/api/v20160930/merge.go | 0 pkg/{armhelpers => }/api/v20160930/merge_test.go | 0 pkg/{armhelpers => }/api/v20160930/types.go | 0 pkg/{armhelpers => }/api/v20160930/types_test.go | 0 pkg/{armhelpers => }/api/v20160930/validate.go | 0 pkg/{armhelpers => }/api/v20170131/const.go | 0 pkg/{armhelpers => }/api/v20170131/doc.go | 0 pkg/{armhelpers => }/api/v20170131/merge.go | 0 pkg/{armhelpers => }/api/v20170131/merge_test.go | 0 pkg/{armhelpers => }/api/v20170131/types.go | 0 pkg/{armhelpers => }/api/v20170131/types_test.go | 0 pkg/{armhelpers => }/api/v20170131/validate.go | 0 pkg/{armhelpers => }/api/v20170131/validate_test.go | 0 pkg/{armhelpers => }/api/v20170701/const.go | 0 pkg/{armhelpers => }/api/v20170701/doc.go | 0 pkg/{armhelpers => }/api/v20170701/merge.go | 0 pkg/{armhelpers => }/api/v20170701/merge_test.go | 0 pkg/{armhelpers => }/api/v20170701/types.go | 0 pkg/{armhelpers => }/api/v20170701/types_test.go | 0 pkg/{armhelpers => }/api/v20170701/validate.go | 0 pkg/{armhelpers => }/api/v20170701/validate_test.go | 0 pkg/{armhelpers => }/api/v20170930/const.go | 0 pkg/{armhelpers => }/api/v20170930/types.go | 0 pkg/{armhelpers => }/api/v20170930/validate.go | 0 pkg/{armhelpers => }/api/vlabs/const.go | 0 pkg/{armhelpers => }/api/vlabs/doc.go | 0 pkg/{armhelpers => }/api/vlabs/merge.go | 0 pkg/{armhelpers => }/api/vlabs/merge_test.go | 0 pkg/{armhelpers => }/api/vlabs/orchestratorversiontypes.go | 0 pkg/{armhelpers => }/api/vlabs/types.go | 0 pkg/{armhelpers => }/api/vlabs/validate.go | 0 pkg/{armhelpers => }/api/vlabs/validate_test.go | 0 71 files changed, 0 insertions(+), 0 deletions(-) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/const.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/doc.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/types_test.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/v20170831/validate.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/const.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/doc.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/types_test.go (100%) rename pkg/{armhelpers => }/api/agentPoolOnlyApi/vlabs/validate.go (100%) rename pkg/{armhelpers => }/api/apiloader.go (100%) rename pkg/{armhelpers => }/api/common/const.go (100%) rename pkg/{armhelpers => }/api/common/helper.go (100%) rename pkg/{armhelpers => }/api/common/helper_test.go (100%) rename pkg/{armhelpers => }/api/common/net.go (100%) rename pkg/{armhelpers => }/api/common/net_test.go (100%) rename pkg/{armhelpers => }/api/const.go (100%) rename pkg/{armhelpers => }/api/converterfromagentpoolonlyapi.go (100%) rename pkg/{armhelpers => }/api/converterfromapi.go (100%) rename pkg/{armhelpers => }/api/convertertoagentpoolonlyapi.go (100%) rename pkg/{armhelpers => }/api/convertertoagentpoolonlyapi_test.go (100%) rename pkg/{armhelpers => }/api/convertertoapi.go (100%) rename pkg/{armhelpers => }/api/convertertoapi_test.go (100%) rename pkg/{armhelpers => }/api/doc.go (100%) rename pkg/{armhelpers => }/api/orchestrators.go (100%) rename pkg/{armhelpers => }/api/orchestrators_test.go (100%) rename pkg/{armhelpers => }/api/strictjson.go (100%) rename pkg/{armhelpers => }/api/strictjson_test.go (100%) rename pkg/{armhelpers => }/api/types.go (100%) rename pkg/{armhelpers => }/api/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/const.go (100%) rename pkg/{armhelpers => }/api/v20160330/doc.go (100%) rename pkg/{armhelpers => }/api/v20160330/merge.go (100%) rename pkg/{armhelpers => }/api/v20160330/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/types.go (100%) rename pkg/{armhelpers => }/api/v20160330/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160330/validate.go (100%) rename pkg/{armhelpers => }/api/v20160930/const.go (100%) rename pkg/{armhelpers => }/api/v20160930/doc.go (100%) rename pkg/{armhelpers => }/api/v20160930/merge.go (100%) rename pkg/{armhelpers => }/api/v20160930/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20160930/types.go (100%) rename pkg/{armhelpers => }/api/v20160930/types_test.go (100%) rename pkg/{armhelpers => }/api/v20160930/validate.go (100%) rename pkg/{armhelpers => }/api/v20170131/const.go (100%) rename pkg/{armhelpers => }/api/v20170131/doc.go (100%) rename pkg/{armhelpers => }/api/v20170131/merge.go (100%) rename pkg/{armhelpers => }/api/v20170131/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20170131/types.go (100%) rename pkg/{armhelpers => }/api/v20170131/types_test.go (100%) rename pkg/{armhelpers => }/api/v20170131/validate.go (100%) rename pkg/{armhelpers => }/api/v20170131/validate_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/const.go (100%) rename pkg/{armhelpers => }/api/v20170701/doc.go (100%) rename pkg/{armhelpers => }/api/v20170701/merge.go (100%) rename pkg/{armhelpers => }/api/v20170701/merge_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/types.go (100%) rename pkg/{armhelpers => }/api/v20170701/types_test.go (100%) rename pkg/{armhelpers => }/api/v20170701/validate.go (100%) rename pkg/{armhelpers => }/api/v20170701/validate_test.go (100%) rename pkg/{armhelpers => }/api/v20170930/const.go (100%) rename pkg/{armhelpers => }/api/v20170930/types.go (100%) rename pkg/{armhelpers => }/api/v20170930/validate.go (100%) rename pkg/{armhelpers => }/api/vlabs/const.go (100%) rename pkg/{armhelpers => }/api/vlabs/doc.go (100%) rename pkg/{armhelpers => }/api/vlabs/merge.go (100%) rename pkg/{armhelpers => }/api/vlabs/merge_test.go (100%) rename pkg/{armhelpers => }/api/vlabs/orchestratorversiontypes.go (100%) rename pkg/{armhelpers => }/api/vlabs/types.go (100%) rename pkg/{armhelpers => }/api/vlabs/validate.go (100%) rename pkg/{armhelpers => }/api/vlabs/validate_test.go (100%) diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go b/pkg/api/agentPoolOnlyApi/v20170831/const.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/const.go rename to pkg/api/agentPoolOnlyApi/v20170831/const.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go b/pkg/api/agentPoolOnlyApi/v20170831/doc.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/doc.go rename to pkg/api/agentPoolOnlyApi/v20170831/doc.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go b/pkg/api/agentPoolOnlyApi/v20170831/types.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types.go rename to pkg/api/agentPoolOnlyApi/v20170831/types.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go b/pkg/api/agentPoolOnlyApi/v20170831/types_test.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/types_test.go rename to pkg/api/agentPoolOnlyApi/v20170831/types_test.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go b/pkg/api/agentPoolOnlyApi/v20170831/validate.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/v20170831/validate.go rename to pkg/api/agentPoolOnlyApi/v20170831/validate.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go b/pkg/api/agentPoolOnlyApi/vlabs/const.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/const.go rename to pkg/api/agentPoolOnlyApi/vlabs/const.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go b/pkg/api/agentPoolOnlyApi/vlabs/doc.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/doc.go rename to pkg/api/agentPoolOnlyApi/vlabs/doc.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go b/pkg/api/agentPoolOnlyApi/vlabs/types.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types.go rename to pkg/api/agentPoolOnlyApi/vlabs/types.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go b/pkg/api/agentPoolOnlyApi/vlabs/types_test.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/types_test.go rename to pkg/api/agentPoolOnlyApi/vlabs/types_test.go diff --git a/pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go b/pkg/api/agentPoolOnlyApi/vlabs/validate.go similarity index 100% rename from pkg/armhelpers/api/agentPoolOnlyApi/vlabs/validate.go rename to pkg/api/agentPoolOnlyApi/vlabs/validate.go diff --git a/pkg/armhelpers/api/apiloader.go b/pkg/api/apiloader.go similarity index 100% rename from pkg/armhelpers/api/apiloader.go rename to pkg/api/apiloader.go diff --git a/pkg/armhelpers/api/common/const.go b/pkg/api/common/const.go similarity index 100% rename from pkg/armhelpers/api/common/const.go rename to pkg/api/common/const.go diff --git a/pkg/armhelpers/api/common/helper.go b/pkg/api/common/helper.go similarity index 100% rename from pkg/armhelpers/api/common/helper.go rename to pkg/api/common/helper.go diff --git a/pkg/armhelpers/api/common/helper_test.go b/pkg/api/common/helper_test.go similarity index 100% rename from pkg/armhelpers/api/common/helper_test.go rename to pkg/api/common/helper_test.go diff --git a/pkg/armhelpers/api/common/net.go b/pkg/api/common/net.go similarity index 100% rename from pkg/armhelpers/api/common/net.go rename to pkg/api/common/net.go diff --git a/pkg/armhelpers/api/common/net_test.go b/pkg/api/common/net_test.go similarity index 100% rename from pkg/armhelpers/api/common/net_test.go rename to pkg/api/common/net_test.go diff --git a/pkg/armhelpers/api/const.go b/pkg/api/const.go similarity index 100% rename from pkg/armhelpers/api/const.go rename to pkg/api/const.go diff --git a/pkg/armhelpers/api/converterfromagentpoolonlyapi.go b/pkg/api/converterfromagentpoolonlyapi.go similarity index 100% rename from pkg/armhelpers/api/converterfromagentpoolonlyapi.go rename to pkg/api/converterfromagentpoolonlyapi.go diff --git a/pkg/armhelpers/api/converterfromapi.go b/pkg/api/converterfromapi.go similarity index 100% rename from pkg/armhelpers/api/converterfromapi.go rename to pkg/api/converterfromapi.go diff --git a/pkg/armhelpers/api/convertertoagentpoolonlyapi.go b/pkg/api/convertertoagentpoolonlyapi.go similarity index 100% rename from pkg/armhelpers/api/convertertoagentpoolonlyapi.go rename to pkg/api/convertertoagentpoolonlyapi.go diff --git a/pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go b/pkg/api/convertertoagentpoolonlyapi_test.go similarity index 100% rename from pkg/armhelpers/api/convertertoagentpoolonlyapi_test.go rename to pkg/api/convertertoagentpoolonlyapi_test.go diff --git a/pkg/armhelpers/api/convertertoapi.go b/pkg/api/convertertoapi.go similarity index 100% rename from pkg/armhelpers/api/convertertoapi.go rename to pkg/api/convertertoapi.go diff --git a/pkg/armhelpers/api/convertertoapi_test.go b/pkg/api/convertertoapi_test.go similarity index 100% rename from pkg/armhelpers/api/convertertoapi_test.go rename to pkg/api/convertertoapi_test.go diff --git a/pkg/armhelpers/api/doc.go b/pkg/api/doc.go similarity index 100% rename from pkg/armhelpers/api/doc.go rename to pkg/api/doc.go diff --git a/pkg/armhelpers/api/orchestrators.go b/pkg/api/orchestrators.go similarity index 100% rename from pkg/armhelpers/api/orchestrators.go rename to pkg/api/orchestrators.go diff --git a/pkg/armhelpers/api/orchestrators_test.go b/pkg/api/orchestrators_test.go similarity index 100% rename from pkg/armhelpers/api/orchestrators_test.go rename to pkg/api/orchestrators_test.go diff --git a/pkg/armhelpers/api/strictjson.go b/pkg/api/strictjson.go similarity index 100% rename from pkg/armhelpers/api/strictjson.go rename to pkg/api/strictjson.go diff --git a/pkg/armhelpers/api/strictjson_test.go b/pkg/api/strictjson_test.go similarity index 100% rename from pkg/armhelpers/api/strictjson_test.go rename to pkg/api/strictjson_test.go diff --git a/pkg/armhelpers/api/types.go b/pkg/api/types.go similarity index 100% rename from pkg/armhelpers/api/types.go rename to pkg/api/types.go diff --git a/pkg/armhelpers/api/types_test.go b/pkg/api/types_test.go similarity index 100% rename from pkg/armhelpers/api/types_test.go rename to pkg/api/types_test.go diff --git a/pkg/armhelpers/api/v20160330/const.go b/pkg/api/v20160330/const.go similarity index 100% rename from pkg/armhelpers/api/v20160330/const.go rename to pkg/api/v20160330/const.go diff --git a/pkg/armhelpers/api/v20160330/doc.go b/pkg/api/v20160330/doc.go similarity index 100% rename from pkg/armhelpers/api/v20160330/doc.go rename to pkg/api/v20160330/doc.go diff --git a/pkg/armhelpers/api/v20160330/merge.go b/pkg/api/v20160330/merge.go similarity index 100% rename from pkg/armhelpers/api/v20160330/merge.go rename to pkg/api/v20160330/merge.go diff --git a/pkg/armhelpers/api/v20160330/merge_test.go b/pkg/api/v20160330/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20160330/merge_test.go rename to pkg/api/v20160330/merge_test.go diff --git a/pkg/armhelpers/api/v20160330/types.go b/pkg/api/v20160330/types.go similarity index 100% rename from pkg/armhelpers/api/v20160330/types.go rename to pkg/api/v20160330/types.go diff --git a/pkg/armhelpers/api/v20160330/types_test.go b/pkg/api/v20160330/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20160330/types_test.go rename to pkg/api/v20160330/types_test.go diff --git a/pkg/armhelpers/api/v20160330/validate.go b/pkg/api/v20160330/validate.go similarity index 100% rename from pkg/armhelpers/api/v20160330/validate.go rename to pkg/api/v20160330/validate.go diff --git a/pkg/armhelpers/api/v20160930/const.go b/pkg/api/v20160930/const.go similarity index 100% rename from pkg/armhelpers/api/v20160930/const.go rename to pkg/api/v20160930/const.go diff --git a/pkg/armhelpers/api/v20160930/doc.go b/pkg/api/v20160930/doc.go similarity index 100% rename from pkg/armhelpers/api/v20160930/doc.go rename to pkg/api/v20160930/doc.go diff --git a/pkg/armhelpers/api/v20160930/merge.go b/pkg/api/v20160930/merge.go similarity index 100% rename from pkg/armhelpers/api/v20160930/merge.go rename to pkg/api/v20160930/merge.go diff --git a/pkg/armhelpers/api/v20160930/merge_test.go b/pkg/api/v20160930/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20160930/merge_test.go rename to pkg/api/v20160930/merge_test.go diff --git a/pkg/armhelpers/api/v20160930/types.go b/pkg/api/v20160930/types.go similarity index 100% rename from pkg/armhelpers/api/v20160930/types.go rename to pkg/api/v20160930/types.go diff --git a/pkg/armhelpers/api/v20160930/types_test.go b/pkg/api/v20160930/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20160930/types_test.go rename to pkg/api/v20160930/types_test.go diff --git a/pkg/armhelpers/api/v20160930/validate.go b/pkg/api/v20160930/validate.go similarity index 100% rename from pkg/armhelpers/api/v20160930/validate.go rename to pkg/api/v20160930/validate.go diff --git a/pkg/armhelpers/api/v20170131/const.go b/pkg/api/v20170131/const.go similarity index 100% rename from pkg/armhelpers/api/v20170131/const.go rename to pkg/api/v20170131/const.go diff --git a/pkg/armhelpers/api/v20170131/doc.go b/pkg/api/v20170131/doc.go similarity index 100% rename from pkg/armhelpers/api/v20170131/doc.go rename to pkg/api/v20170131/doc.go diff --git a/pkg/armhelpers/api/v20170131/merge.go b/pkg/api/v20170131/merge.go similarity index 100% rename from pkg/armhelpers/api/v20170131/merge.go rename to pkg/api/v20170131/merge.go diff --git a/pkg/armhelpers/api/v20170131/merge_test.go b/pkg/api/v20170131/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/merge_test.go rename to pkg/api/v20170131/merge_test.go diff --git a/pkg/armhelpers/api/v20170131/types.go b/pkg/api/v20170131/types.go similarity index 100% rename from pkg/armhelpers/api/v20170131/types.go rename to pkg/api/v20170131/types.go diff --git a/pkg/armhelpers/api/v20170131/types_test.go b/pkg/api/v20170131/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/types_test.go rename to pkg/api/v20170131/types_test.go diff --git a/pkg/armhelpers/api/v20170131/validate.go b/pkg/api/v20170131/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170131/validate.go rename to pkg/api/v20170131/validate.go diff --git a/pkg/armhelpers/api/v20170131/validate_test.go b/pkg/api/v20170131/validate_test.go similarity index 100% rename from pkg/armhelpers/api/v20170131/validate_test.go rename to pkg/api/v20170131/validate_test.go diff --git a/pkg/armhelpers/api/v20170701/const.go b/pkg/api/v20170701/const.go similarity index 100% rename from pkg/armhelpers/api/v20170701/const.go rename to pkg/api/v20170701/const.go diff --git a/pkg/armhelpers/api/v20170701/doc.go b/pkg/api/v20170701/doc.go similarity index 100% rename from pkg/armhelpers/api/v20170701/doc.go rename to pkg/api/v20170701/doc.go diff --git a/pkg/armhelpers/api/v20170701/merge.go b/pkg/api/v20170701/merge.go similarity index 100% rename from pkg/armhelpers/api/v20170701/merge.go rename to pkg/api/v20170701/merge.go diff --git a/pkg/armhelpers/api/v20170701/merge_test.go b/pkg/api/v20170701/merge_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/merge_test.go rename to pkg/api/v20170701/merge_test.go diff --git a/pkg/armhelpers/api/v20170701/types.go b/pkg/api/v20170701/types.go similarity index 100% rename from pkg/armhelpers/api/v20170701/types.go rename to pkg/api/v20170701/types.go diff --git a/pkg/armhelpers/api/v20170701/types_test.go b/pkg/api/v20170701/types_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/types_test.go rename to pkg/api/v20170701/types_test.go diff --git a/pkg/armhelpers/api/v20170701/validate.go b/pkg/api/v20170701/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170701/validate.go rename to pkg/api/v20170701/validate.go diff --git a/pkg/armhelpers/api/v20170701/validate_test.go b/pkg/api/v20170701/validate_test.go similarity index 100% rename from pkg/armhelpers/api/v20170701/validate_test.go rename to pkg/api/v20170701/validate_test.go diff --git a/pkg/armhelpers/api/v20170930/const.go b/pkg/api/v20170930/const.go similarity index 100% rename from pkg/armhelpers/api/v20170930/const.go rename to pkg/api/v20170930/const.go diff --git a/pkg/armhelpers/api/v20170930/types.go b/pkg/api/v20170930/types.go similarity index 100% rename from pkg/armhelpers/api/v20170930/types.go rename to pkg/api/v20170930/types.go diff --git a/pkg/armhelpers/api/v20170930/validate.go b/pkg/api/v20170930/validate.go similarity index 100% rename from pkg/armhelpers/api/v20170930/validate.go rename to pkg/api/v20170930/validate.go diff --git a/pkg/armhelpers/api/vlabs/const.go b/pkg/api/vlabs/const.go similarity index 100% rename from pkg/armhelpers/api/vlabs/const.go rename to pkg/api/vlabs/const.go diff --git a/pkg/armhelpers/api/vlabs/doc.go b/pkg/api/vlabs/doc.go similarity index 100% rename from pkg/armhelpers/api/vlabs/doc.go rename to pkg/api/vlabs/doc.go diff --git a/pkg/armhelpers/api/vlabs/merge.go b/pkg/api/vlabs/merge.go similarity index 100% rename from pkg/armhelpers/api/vlabs/merge.go rename to pkg/api/vlabs/merge.go diff --git a/pkg/armhelpers/api/vlabs/merge_test.go b/pkg/api/vlabs/merge_test.go similarity index 100% rename from pkg/armhelpers/api/vlabs/merge_test.go rename to pkg/api/vlabs/merge_test.go diff --git a/pkg/armhelpers/api/vlabs/orchestratorversiontypes.go b/pkg/api/vlabs/orchestratorversiontypes.go similarity index 100% rename from pkg/armhelpers/api/vlabs/orchestratorversiontypes.go rename to pkg/api/vlabs/orchestratorversiontypes.go diff --git a/pkg/armhelpers/api/vlabs/types.go b/pkg/api/vlabs/types.go similarity index 100% rename from pkg/armhelpers/api/vlabs/types.go rename to pkg/api/vlabs/types.go diff --git a/pkg/armhelpers/api/vlabs/validate.go b/pkg/api/vlabs/validate.go similarity index 100% rename from pkg/armhelpers/api/vlabs/validate.go rename to pkg/api/vlabs/validate.go diff --git a/pkg/armhelpers/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go similarity index 100% rename from pkg/armhelpers/api/vlabs/validate_test.go rename to pkg/api/vlabs/validate_test.go From 5cf36c1827bff071c21f271cd406bad7d2f69223 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Wed, 15 Nov 2017 15:36:31 -0800 Subject: [PATCH 11/24] added rescheduler addon --- ...teraddons-kube-rescheduler-deployment.yaml | 32 +++++++++++++++++++ parts/kubernetesmastercustomdata.yml | 8 +++++ parts/kubernetesparams.t | 7 ++++ pkg/acsengine/const.go | 2 ++ pkg/acsengine/engine.go | 4 +++ test/cluster-tests/kubernetes/test.sh | 2 +- 6 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml diff --git a/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml b/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml new file mode 100644 index 0000000000..e3b6ed128c --- /dev/null +++ b/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml @@ -0,0 +1,32 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: rescheduler + namespace: kube-system + labels: + k8s-app: rescheduler + kubernetes.io/cluster-service: "true" + addonmanager.kubernetes.io/mode: Reconcile +spec: + replicas: 1 + selector: + matchLabels: + k8s-app: rescheduler + template: + metadata: + labels: + k8s-app: rescheduler + annotations: + scheduler.alpha.kubernetes.io/critical-pod: '' + spec: + containers: + - image: + name: rescheduler + resources: + requests: + cpu: 10m + memory: 100Mi + command: + - sh + - -c + - '/rescheduler' \ No newline at end of file diff --git a/parts/kubernetesmastercustomdata.yml b/parts/kubernetesmastercustomdata.yml index 49474c187c..8fdb17aa28 100644 --- a/parts/kubernetesmastercustomdata.yml +++ b/parts/kubernetesmastercustomdata.yml @@ -140,6 +140,13 @@ write_files: content: !!binary | MASTER_ADDON_HEAPSTER_DEPLOYMENT_B64_GZIP_STR +- path: /etc/kubernetes/addons/kube-rescheduler-deployment.yaml + permissions: "0644" + encoding: gzip + owner: "root" + content: !!binary | + MASTER_ADDON_RESCHEDULER_DEPLOYMENT_B64_GZIP_STR + - path: /etc/kubernetes/addons/azure-storage-classes.yaml permissions: "0644" encoding: gzip @@ -271,6 +278,7 @@ write_files: {{if not .OrchestratorProfile.KubernetesConfig.DisabledAddons.Dashboard}} sed -i "s||{{WrapAsVariable "kubernetesDashboardSpec"}}|g" "/etc/kubernetes/addons/kubernetes-dashboard-deployment.yaml" {{end}} + sed -i "s||{{WrapAsVariable "kubernetesReschedulerSpec"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesTillerSpec"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesTillerCPURequests"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesTillerMemoryRequests"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" diff --git a/parts/kubernetesparams.t b/parts/kubernetesparams.t index 5c6253f2ee..399209c0a7 100644 --- a/parts/kubernetesparams.t +++ b/parts/kubernetesparams.t @@ -197,6 +197,13 @@ }, "type": "string" }, + "kubernetesReschedulerSpec": { + {{PopulateClassicModeDefaultValue "kubernetesReschedulerSpec"}} + "metadata": { + "description": "The container spec for rescheduler." + }, + "type": "string" + }, "kubernetesPodInfraContainerSpec": { {{PopulateClassicModeDefaultValue "kubernetesPodInfraContainerSpec"}} "metadata": { diff --git a/pkg/acsengine/const.go b/pkg/acsengine/const.go index 1d85bac610..0a76e3e355 100644 --- a/pkg/acsengine/const.go +++ b/pkg/acsengine/const.go @@ -88,6 +88,8 @@ const ( DefaultOrchestratorName = "k8s" // DefaultEtcdDiskSize specifies the default size for Kubernetes master etcd disk volumes in GB DefaultEtcdDiskSize = "128" + // DefaultReschedulerImage defines the rescheduler deployment version on Kubernetes Clusters + DefaultReschedulerImage = "rescheduler:v0.3.1", ) const ( diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go index 54377e2d35..c6708470b8 100644 --- a/pkg/acsengine/engine.go +++ b/pkg/acsengine/engine.go @@ -121,6 +121,7 @@ var kubernetesAddonYamls = map[string]string{ "MASTER_ADDON_KUBERNETES_DASHBOARD_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kubernetes-dashboard-deployment.yaml", "MASTER_ADDON_AZURE_STORAGE_CLASSES_B64_GZIP_STR": "kubernetesmasteraddons-azure-storage-classes.yaml", "MASTER_ADDON_TILLER_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-tiller-deployment.yaml", + "MASTER_ADDON_RESCHEDULER_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kube-rescheduler-deployment.yaml", } var kubernetesAddonYamls15 = map[string]string{ @@ -553,6 +554,7 @@ func getParameters(cs *api.ContainerService, isClassicMode bool, generatorCode s addValue(parametersMap, "kubernetesTillerCPULimit", properties.OrchestratorProfile.KubernetesConfig.TillerCPULimit) addValue(parametersMap, "kubernetesTillerMemoryRequests", properties.OrchestratorProfile.KubernetesConfig.TillerMemoryRequests) addValue(parametersMap, "kubernetesTillerMemoryLimit", properties.OrchestratorProfile.KubernetesConfig.TillerMemoryLimit) + addValue(parametersMap, "kubernetesReschedulerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeImages[KubernetesVersion]["rescheduler"]) addValue(parametersMap, "kubernetesKubeDNSSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["dns"]) addValue(parametersMap, "kubernetesPodInfraContainerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["pause"]) addValue(parametersMap, "kubernetesNodeStatusUpdateFrequency", properties.OrchestratorProfile.KubernetesConfig.NodeStatusUpdateFrequency) @@ -1175,6 +1177,8 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat val = DefaultTillerCPULimit case "kubernetesTillerMemoryLimit": val = DefaultTillerMemoryLimit + case "kubernetesReschedulerSpec": + val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeImages[kubernetesVersion]["rescheduler"] case "kubernetesKubeDNSSpec": val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["dns"] case "kubernetesPodInfraContainerSpec": diff --git a/test/cluster-tests/kubernetes/test.sh b/test/cluster-tests/kubernetes/test.sh index e6fe85a577..8d38e61ffd 100755 --- a/test/cluster-tests/kubernetes/test.sh +++ b/test/cluster-tests/kubernetes/test.sh @@ -102,7 +102,7 @@ fi ###### Check existence and status of essential pods # we test other essential pods (kube-dns, kube-proxy) separately -pods="heapster kube-addon-manager kube-apiserver kube-controller-manager kube-scheduler tiller" +pods="heapster rescheduler kube-addon-manager kube-apiserver kube-controller-manager kube-scheduler tiller" log "Checking $pods" count=60 From 900cd02f4989d9e93b0d8d09ad2fe38da2b21a91 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Wed, 15 Nov 2017 15:48:55 -0800 Subject: [PATCH 12/24] fix typo --- pkg/acsengine/const.go | 2 +- pkg/acsengine/engine.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/acsengine/const.go b/pkg/acsengine/const.go index 0a76e3e355..0d9d49b1ed 100644 --- a/pkg/acsengine/const.go +++ b/pkg/acsengine/const.go @@ -89,7 +89,7 @@ const ( // DefaultEtcdDiskSize specifies the default size for Kubernetes master etcd disk volumes in GB DefaultEtcdDiskSize = "128" // DefaultReschedulerImage defines the rescheduler deployment version on Kubernetes Clusters - DefaultReschedulerImage = "rescheduler:v0.3.1", + DefaultReschedulerImage = "rescheduler:v0.3.1" ) const ( diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go index c6708470b8..ecf9172fbe 100644 --- a/pkg/acsengine/engine.go +++ b/pkg/acsengine/engine.go @@ -554,7 +554,7 @@ func getParameters(cs *api.ContainerService, isClassicMode bool, generatorCode s addValue(parametersMap, "kubernetesTillerCPULimit", properties.OrchestratorProfile.KubernetesConfig.TillerCPULimit) addValue(parametersMap, "kubernetesTillerMemoryRequests", properties.OrchestratorProfile.KubernetesConfig.TillerMemoryRequests) addValue(parametersMap, "kubernetesTillerMemoryLimit", properties.OrchestratorProfile.KubernetesConfig.TillerMemoryLimit) - addValue(parametersMap, "kubernetesReschedulerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeImages[KubernetesVersion]["rescheduler"]) + addValue(parametersMap, "kubernetesReschedulerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["rescheduler"]) addValue(parametersMap, "kubernetesKubeDNSSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["dns"]) addValue(parametersMap, "kubernetesPodInfraContainerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["pause"]) addValue(parametersMap, "kubernetesNodeStatusUpdateFrequency", properties.OrchestratorProfile.KubernetesConfig.NodeStatusUpdateFrequency) @@ -1178,7 +1178,7 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat case "kubernetesTillerMemoryLimit": val = DefaultTillerMemoryLimit case "kubernetesReschedulerSpec": - val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeImages[kubernetesVersion]["rescheduler"] + val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["rescheduler"] case "kubernetesKubeDNSSpec": val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["dns"] case "kubernetesPodInfraContainerSpec": From b04de96ff46c925c032457aa26b03d8ed7d812cf Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Wed, 15 Nov 2017 16:51:39 -0800 Subject: [PATCH 13/24] add rescheduler spec to mastervars --- parts/kubernetesmastervars.t | 1 + 1 file changed, 1 insertion(+) diff --git a/parts/kubernetesmastervars.t b/parts/kubernetesmastervars.t index 3b99576efe..8af7ebdfc1 100644 --- a/parts/kubernetesmastervars.t +++ b/parts/kubernetesmastervars.t @@ -21,6 +21,7 @@ "kubernetesTillerMemoryRequests": "[parameters('kubernetesTillerMemoryRequests')]", "kubernetesTillerCPULimit": "[parameters('kubernetesTillerCPULimit')]", "kubernetesTillerMemoryLimit": "[parameters('kubernetesTillerMemoryLimit')]", + "kubernetesReschedulerSpec": "[parameters('kubernetesReschedulerSpec')]", "kubernetesPodInfraContainerSpec": "[parameters('kubernetesPodInfraContainerSpec')]", "kubernetesNodeStatusUpdateFrequency": "[parameters('kubernetesNodeStatusUpdateFrequency')]", "kubernetesCtrlMgrNodeMonitorGracePeriod": "[parameters('kubernetesCtrlMgrNodeMonitorGracePeriod')]", From 1b1bc40e8d6c67b382dca254235e5e4a42979ed5 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Wed, 15 Nov 2017 16:51:39 -0800 Subject: [PATCH 14/24] add rescheduler spec to mastervars --- parts/kubernetesmastervars.t | 1 + 1 file changed, 1 insertion(+) diff --git a/parts/kubernetesmastervars.t b/parts/kubernetesmastervars.t index 3b99576efe..8af7ebdfc1 100644 --- a/parts/kubernetesmastervars.t +++ b/parts/kubernetesmastervars.t @@ -21,6 +21,7 @@ "kubernetesTillerMemoryRequests": "[parameters('kubernetesTillerMemoryRequests')]", "kubernetesTillerCPULimit": "[parameters('kubernetesTillerCPULimit')]", "kubernetesTillerMemoryLimit": "[parameters('kubernetesTillerMemoryLimit')]", + "kubernetesReschedulerSpec": "[parameters('kubernetesReschedulerSpec')]", "kubernetesPodInfraContainerSpec": "[parameters('kubernetesPodInfraContainerSpec')]", "kubernetesNodeStatusUpdateFrequency": "[parameters('kubernetesNodeStatusUpdateFrequency')]", "kubernetesCtrlMgrNodeMonitorGracePeriod": "[parameters('kubernetesCtrlMgrNodeMonitorGracePeriod')]", From d4df8fc843eaf6cac6d44daea025757b022835da Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Wed, 15 Nov 2017 17:46:30 -0800 Subject: [PATCH 15/24] added rescheduler image to KubeConfigs --- pkg/acsengine/k8s_versions.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkg/acsengine/k8s_versions.go b/pkg/acsengine/k8s_versions.go index 7f3701960f..105e5bf22b 100644 --- a/pkg/acsengine/k8s_versions.go +++ b/pkg/acsengine/k8s_versions.go @@ -19,6 +19,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "windowszip": "v1.8.2-2int.zip", "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, @@ -44,6 +45,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "windowszip": "v1.8.1-2int.zip", "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, @@ -69,6 +71,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "windowszip": "v1.8.0-2int.zip", "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, @@ -94,6 +97,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "windowszip": "v1.7.10-1int.zip", "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, @@ -119,6 +123,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "windowszip": "v1.7.9-2int.zip", "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, @@ -144,6 +149,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "windowszip": "v1.7.7-2int.zip", "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, @@ -169,6 +175,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "windowszip": "v1.7.5-4int.zip", "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, @@ -194,6 +201,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "windowszip": "v1.7.4-2int.zip", "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, @@ -219,6 +227,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "windowszip": "v1.7.2-1int.zip", "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, @@ -244,6 +253,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, @@ -268,6 +278,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, @@ -292,6 +303,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, @@ -316,6 +328,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, @@ -340,6 +353,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, @@ -364,6 +378,7 @@ var KubeConfigs = map[string]map[string]string{ "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", "pause": "pause-amd64:3.0", "tiller": DefaultTillerImage, + "rescheduler": DefaultReschedulerImage, "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, From 93e58e5ac5f2be8861e0fe58167ba0f23f65e87d Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 16 Nov 2017 14:39:38 -0800 Subject: [PATCH 16/24] changed to using new addon pattern --- pkg/acsengine/const.go | 2 + pkg/acsengine/defaults.go | 25 ++ pkg/acsengine/engine.go | 54 ++- pkg/acsengine/k8s_versions.go | 772 +++++++++++++++++----------------- pkg/api/const.go | 2 + pkg/api/types.go | 11 + pkg/api/types_test.go | 30 ++ 7 files changed, 507 insertions(+), 389 deletions(-) diff --git a/pkg/acsengine/const.go b/pkg/acsengine/const.go index 0cc22ec119..570ef38552 100644 --- a/pkg/acsengine/const.go +++ b/pkg/acsengine/const.go @@ -87,6 +87,8 @@ const ( DefaultEtcdDiskSize = "128" // DefaultReschedulerImage defines the rescheduler deployment version on Kubernetes Clusters DefaultReschedulerImage = "rescheduler:v0.3.1" + // DefaultReschedulerAddonName is the name of the rescheduler addon deployment + DefaultReschedulerAddonName = "rescheduler" ) const ( diff --git a/pkg/acsengine/defaults.go b/pkg/acsengine/defaults.go index b2b8d08ea8..caeba6e6ae 100644 --- a/pkg/acsengine/defaults.go +++ b/pkg/acsengine/defaults.go @@ -178,6 +178,21 @@ var ( }, }, } + + // DefaultReschedulerAddonsConfig is the default rescheduler Kubernetes addon Config + DefaultReschedulerAddonsConfig = api.KubernetesAddon{ + Name: DefaultReschedulerAddonName, + Enabled: pointerToBool(true), + Containers: []api.KubernetesContainerSpec{ + { + Name: DefaultReschedulerAddonName, + CPURequests: "300m", + MemoryRequests: "150Mi", + CPULimits: "300m", + MemoryLimits: "150Mi", + }, + }, + } ) // SetPropertiesDefaults for the container Properties, returns true if certs are generated @@ -227,6 +242,7 @@ func setOrchestratorDefaults(cs *api.ContainerService) { o.KubernetesConfig.Addons = []api.KubernetesAddon{ DefaultTillerAddonsConfig, DefaultDashboardAddonsConfig, + DefaultReschedulerAddonsConfig, } } else { // For each addon, provide default configuration if user didn't provide its own config @@ -240,6 +256,11 @@ func setOrchestratorDefaults(cs *api.ContainerService) { // Provide default acs-engine config for Dashboard o.KubernetesConfig.Addons = append(o.KubernetesConfig.Addons, DefaultDashboardAddonsConfig) } + r := getAddonsIndexByName(o.KubernetesConfig.Addons, DefaultReschedulerAddonName) + if r < 0 { + // Provide default acs-engine config for Rescheduler + o.KubernetesConfig.Addons = append(o.KubernetesConfig.Addons, DefaultReschedulerAddonsConfig) + } } if o.KubernetesConfig.KubernetesImageBase == "" { o.KubernetesConfig.KubernetesImageBase = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase @@ -334,6 +355,10 @@ func setOrchestratorDefaults(cs *api.ContainerService) { if a.OrchestratorProfile.KubernetesConfig.Addons[d].IsEnabled(api.DefaultDashboardAddonEnabled) { a.OrchestratorProfile.KubernetesConfig.Addons[d] = assignDefaultAddonVals(a.OrchestratorProfile.KubernetesConfig.Addons[d], DefaultDashboardAddonsConfig) } + r := getAddonsIndexByName(a.OrchestratorProfile.KubernetesConfig.Addons, DefaultReschedulerAddonName) + if a.OrchestratorProfile.KubernetesConfig.Addons[r].IsEnabled(api.DefaultReschedulerAddonEnabled) { + a.OrchestratorProfile.KubernetesConfig.Addons[r] = assignDefaultAddonVals(a.OrchestratorProfile.KubernetesConfig.Addons[r], DefaultDashboardAddonsConfig) + } if "" == a.OrchestratorProfile.KubernetesConfig.EtcdDiskSizeGB { a.OrchestratorProfile.KubernetesConfig.EtcdDiskSizeGB = DefaultEtcdDiskSize diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go index aa89f39554..19ee3fa26e 100644 --- a/pkg/acsengine/engine.go +++ b/pkg/acsengine/engine.go @@ -572,7 +572,20 @@ func getParameters(cs *api.ContainerService, isClassicMode bool, generatorCode s if dashboardAddon.Containers[c].Image != "" { addValue(parametersMap, "kubernetesDashboardSpec", dashboardAddon.Containers[c].Image) } else { - addValue(parametersMap, "kubernetesDashboardSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["dashboard"]) + addValue(parametersMap, "kubernetesDashboardSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion][DefaultDashboardAddonName]) + } + } + reschedulerAddon := getAddonByName(properties.OrchestratorProfile.KubernetesConfig.Addons, DefaultReschedulerAddonName) + c = getAddonContainersIndexByName(reschedulerAddon.Containers, DefaultReschedulerAddonName) + if c > -1 { + addValue(parametersMap, "kubernetesReschedulerCPURequests", reschedulerAddon.Containers[c].CPURequests) + addValue(parametersMap, "kubernetesReschedulerCPULimit", reschedulerAddon.Containers[c].CPULimits) + addValue(parametersMap, "kubernetesReschedulerMemoryRequests", reschedulerAddon.Containers[c].MemoryRequests) + addValue(parametersMap, "kubernetesReschedulerMemoryLimit", reschedulerAddon.Containers[c].MemoryLimits) + if reschedulerAddon.Containers[c].Image != "" { + addValue(parametersMap, "kubernetesReschedulerSpec", dashboardAddon.Containers[c].Image) + } else { + addValue(parametersMap, "kubernetesReschedulerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion][DefaultReschedulerAddonName]) } } addValue(parametersMap, "kubernetesKubeDNSSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["dns"]) @@ -964,6 +977,9 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat if !profile.OrchestratorProfile.KubernetesConfig.IsDashboardEnabled() { delete(addonYamls, "MASTER_ADDON_KUBERNETES_DASHBOARD_DEPLOYMENT_B64_GZIP_STR") } + if !profile.OrchestratorProfile.KubernetesConfig.IsReschedulerEnabled() { + delete(addonYamls, "MASTER_ADDON_RESCHEDULER_DEPLOYMENT_B64_GZIP_STR") + } for placeholder, filename := range addonYamls { addonTextContents := getBase64CustomScript(filename) str = strings.Replace(str, placeholder, addonTextContents, -1) @@ -1177,6 +1193,8 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat tC := getAddonContainersIndexByName(tillerAddon.Containers, DefaultTillerAddonName) dashboardAddon := getAddonByName(cs.Properties.OrchestratorProfile.KubernetesConfig.Addons, DefaultDashboardAddonName) dC := getAddonContainersIndexByName(dashboardAddon.Containers, DefaultDashboardAddonName) + reschedulerAddon := getAddonByName(cs.Properties.OrchestratorProfile.KubernetesConfig.Addons, DefaultReschedulerAddonName) + rC := getAddonContainersIndexByName(reschedulerAddon.Containers, DefaultReschedulerAddonName) switch attr { case "kubernetesHyperkubeSpec": val = cs.Properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["hyperkube"] @@ -1193,7 +1211,7 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat val = dashboardAddon.Containers[dC].Image } } else { - val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["dashboard"] + val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion][DefaultDashboardAddonName] } case "kubernetesDashboardCPURequests": if dC > -1 { @@ -1258,7 +1276,37 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat val = "" } case "kubernetesReschedulerSpec": - val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["rescheduler"] + if rC > -1 { + if dashboardAddon.Containers[rC].Image != "" { + val = dashboardAddon.Containers[rC].Image + } + } else { + val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion][DefaultReschedulerAddonName] + } + case "kubernetesReschedulerCPURequests": + if rC > -1 { + val = dashboardAddon.Containers[rC].CPURequests + } else { + val = "" + } + case "kubernetesReschedulerMemoryRequests": + if rC > -1 { + val = dashboardAddon.Containers[rC].MemoryRequests + } else { + val = "" + } + case "kubernetesReschedulerCPULimit": + if rC > -1 { + val = dashboardAddon.Containers[rC].CPULimits + } else { + val = "" + } + case "kubernetesReschedulerMemoryLimit": + if rC > -1 { + val = dashboardAddon.Containers[rC].MemoryLimits + } else { + val = "" + } case "kubernetesKubeDNSSpec": val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["dns"] case "kubernetesPodInfraContainerSpec": diff --git a/pkg/acsengine/k8s_versions.go b/pkg/acsengine/k8s_versions.go index fb9cb63751..b53245a229 100644 --- a/pkg/acsengine/k8s_versions.go +++ b/pkg/acsengine/k8s_versions.go @@ -9,423 +9,423 @@ import ( // KubeConfigs represents Docker images used for Kubernetes components based on Kubernetes versions (major.minor.patch) var KubeConfigs = map[string]map[string]string{ common.KubernetesVersion1Dot8Dot2: { - "hyperkube": "hyperkube-amd64:v1.8.2", - "dashboard": "kubernetes-dashboard-amd64:v1.7.1", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.4.2", - "dns": "k8s-dns-kube-dns-amd64:1.14.5", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "windowszip": "v1.8.2-2int.zip", - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.8.2", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.7.1", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.4.2", + "dns": "k8s-dns-kube-dns-amd64:1.14.5", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "windowszip": "v1.8.2-2int.zip", + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot8Dot1: { - "hyperkube": "hyperkube-amd64:v1.8.1", - "dashboard": "kubernetes-dashboard-amd64:v1.7.1", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.4.2", - "dns": "k8s-dns-kube-dns-amd64:1.14.5", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "windowszip": "v1.8.1-2int.zip", - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.8.1", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.7.1", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.4.2", + "dns": "k8s-dns-kube-dns-amd64:1.14.5", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "windowszip": "v1.8.1-2int.zip", + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot8Dot0: { - "hyperkube": "hyperkube-amd64:v1.8.0", - "dashboard": "kubernetes-dashboard-amd64:v1.7.1", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.4.2", - "dns": "k8s-dns-kube-dns-amd64:1.14.5", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "windowszip": "v1.8.0-2int.zip", - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.8.0", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.7.1", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.4.2", + "dns": "k8s-dns-kube-dns-amd64:1.14.5", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "windowszip": "v1.8.0-2int.zip", + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot7Dot10: { - "hyperkube": "hyperkube-amd64:v1.7.10", - "dashboard": "kubernetes-dashboard-amd64:v1.6.3", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.4.2", - "dns": "k8s-dns-kube-dns-amd64:1.14.5", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "windowszip": "v1.7.10-1int.zip", - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.7.10", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.3", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.4.2", + "dns": "k8s-dns-kube-dns-amd64:1.14.5", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "windowszip": "v1.7.10-1int.zip", + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot7Dot9: { - "hyperkube": "hyperkube-amd64:v1.7.9", - "dashboard": "kubernetes-dashboard-amd64:v1.6.3", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.4.2", - "dns": "k8s-dns-kube-dns-amd64:1.14.5", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "windowszip": "v1.7.9-2int.zip", - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.7.9", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.3", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.4.2", + "dns": "k8s-dns-kube-dns-amd64:1.14.5", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "windowszip": "v1.7.9-2int.zip", + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot7Dot7: { - "hyperkube": "hyperkube-amd64:v1.7.7", - "dashboard": "kubernetes-dashboard-amd64:v1.6.3", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.4.2", - "dns": "k8s-dns-kube-dns-amd64:1.14.5", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "windowszip": "v1.7.7-2int.zip", - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.7.7", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.3", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.4.2", + "dns": "k8s-dns-kube-dns-amd64:1.14.5", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "windowszip": "v1.7.7-2int.zip", + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot7Dot5: { - "hyperkube": "hyperkube-amd64:v1.7.5", - "dashboard": "kubernetes-dashboard-amd64:v1.6.3", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.4.2", - "dns": "k8s-dns-kube-dns-amd64:1.14.4", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "windowszip": "v1.7.5-4int.zip", - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.7.5", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.3", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.4.2", + "dns": "k8s-dns-kube-dns-amd64:1.14.4", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "windowszip": "v1.7.5-4int.zip", + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot7Dot4: { - "hyperkube": "hyperkube-amd64:v1.7.4", - "dashboard": "kubernetes-dashboard-amd64:v1.6.3", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.4.1", - "dns": "k8s-dns-kube-dns-amd64:1.14.4", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "windowszip": "v1.7.4-2int.zip", - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.7.4", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.3", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.4.1", + "dns": "k8s-dns-kube-dns-amd64:1.14.4", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "windowszip": "v1.7.4-2int.zip", + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot7Dot2: { - "hyperkube": "hyperkube-amd64:v1.7.2", - "dashboard": "kubernetes-dashboard-amd64:v1.6.3", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.4.1", - "dns": "k8s-dns-kube-dns-amd64:1.14.4", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "windowszip": "v1.7.2-1int.zip", - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.7.2", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.3", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.4.1", + "dns": "k8s-dns-kube-dns-amd64:1.14.4", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "windowszip": "v1.7.2-1int.zip", + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot7Dot1: { - "hyperkube": "hyperkube-amd64:v1.7.1", - "dashboard": "kubernetes-dashboard-amd64:v1.6.1", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster:v1.4.0", - "dns": "k8s-dns-kube-dns-amd64:1.14.4", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.7.1", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.1", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster:v1.4.0", + "dns": "k8s-dns-kube-dns-amd64:1.14.4", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot7Dot0: { - "hyperkube": "hyperkube-amd64:v1.7.0", - "dashboard": "kubernetes-dashboard-amd64:v1.6.1", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster:v1.4.0", - "dns": "k8s-dns-kube-dns-amd64:1.14.4", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.7.0", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.1", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster:v1.4.0", + "dns": "k8s-dns-kube-dns-amd64:1.14.4", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot6Dot12: { - "hyperkube": "hyperkube-amd64:v1.6.12", - "dashboard": "kubernetes-dashboard-amd64:v1.6.3", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.3.0", - "dns": "k8s-dns-kube-dns-amd64:1.14.5", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.6.12", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.3", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.3.0", + "dns": "k8s-dns-kube-dns-amd64:1.14.5", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot6Dot11: { - "hyperkube": "hyperkube-amd64:v1.6.11", - "dashboard": "kubernetes-dashboard-amd64:v1.6.3", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.3.0", - "dns": "k8s-dns-kube-dns-amd64:1.14.5", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.6.11", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.3", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.3.0", + "dns": "k8s-dns-kube-dns-amd64:1.14.5", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot6Dot9: { - "hyperkube": "hyperkube-amd64:v1.6.9", - "dashboard": "kubernetes-dashboard-amd64:v1.6.3", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.3.0", - "dns": "k8s-dns-kube-dns-amd64:1.14.4", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.6.9", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.3", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.3.0", + "dns": "k8s-dns-kube-dns-amd64:1.14.4", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot6Dot6: { - "hyperkube": "hyperkube-amd64:v1.6.6", - "dashboard": "kubernetes-dashboard-amd64:v1.6.3", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.7", - "heapster": "heapster-amd64:v1.3.0", - "dns": "k8s-dns-kube-dns-amd64:1.14.4", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: DefaultTillerImage, - "rescheduler": DefaultReschedulerImage, - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), - "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), - "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), - "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), - "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), - "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.6.6", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.6.3", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.3.0", + "dns": "k8s-dns-kube-dns-amd64:1.14.4", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.4", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot5Dot8: { - "hyperkube": "hyperkube-amd64:v1.5.8", - "dashboard": "kubernetes-dashboard-amd64:v1.5.1", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.6", - "heapster": "heapster:v1.2.0", - "dns": "kubedns-amd64:1.7", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "kube-dnsmasq-amd64:1.3", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: "tiller:v2.5.1", - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.5.8", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.5.1", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.6", + "heapster": "heapster:v1.2.0", + "dns": "kubedns-amd64:1.7", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "kube-dnsmasq-amd64:1.3", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: "tiller:v2.5.1", + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, common.KubernetesVersion1Dot5Dot7: { - "hyperkube": "hyperkube-amd64:v1.5.7", - "dashboard": "kubernetes-dashboard-amd64:v1.5.1", - "exechealthz": "exechealthz-amd64:1.2", - "addonresizer": "addon-resizer:1.6", - "heapster": "heapster:v1.2.0", - "dns": "kubedns-amd64:1.7", - "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", - "dnsmasq": "kube-dnsmasq-amd64:1.3", - "pause": "pause-amd64:3.0", - DefaultTillerAddonName: "tiller:v2.5.1", - "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, - "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, - "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, - "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, - "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), - "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + "hyperkube": "hyperkube-amd64:v1.5.7", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.5.1", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.6", + "heapster": "heapster:v1.2.0", + "dns": "kubedns-amd64:1.7", + "addonmanager": "kube-addon-manager-amd64:v6.4-beta.2", + "dnsmasq": "kube-dnsmasq-amd64:1.3", + "pause": "pause-amd64:3.0", + DefaultTillerAddonName: "tiller:v2.5.1", + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), }, } diff --git a/pkg/api/const.go b/pkg/api/const.go index f55819d9d6..ec24b956a7 100644 --- a/pkg/api/const.go +++ b/pkg/api/const.go @@ -86,4 +86,6 @@ const ( DefaultTillerAddonEnabled = true // DefaultDashboardAddonEnabled determines the acs-engine provided default for enabling kubernetes-dashboard addon DefaultDashboardAddonEnabled = true + // DefaultReschedulerAddonEnabled determines the acs-engine provided default for enabling kubernetes-rescheduler addon + DefaultReschedulerAddonEnabled = true ) diff --git a/pkg/api/types.go b/pkg/api/types.go index 0442f518ad..3a032dfe4d 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -599,3 +599,14 @@ func (k *KubernetesConfig) IsDashboardEnabled() bool { } return dashboardAddon.IsEnabled(DefaultDashboardAddonEnabled) } + +// IsReschedulerEnabled checks if the rescheduler addon is enabled +func (k *KubernetesConfig) IsReschedulerEnabled() bool { + var reschedulerAddon KubernetesAddon + for i := range k.Addons { + if k.Addons[i].Name == "rescheduler" { + reschedulerAddon = k.Addons[i] + } + } + return reschedulerAddon.IsEnabled(DefaultReschedulerAddonEnabled) +} diff --git a/pkg/api/types_test.go b/pkg/api/types_test.go index 9af88ff4fb..55ea952c5d 100644 --- a/pkg/api/types_test.go +++ b/pkg/api/types_test.go @@ -144,6 +144,36 @@ func TestIsDashboardEnabled(t *testing.T) { } } +func TestIsReschedulerEnabled(t *testing.T) { + c := KubernetesConfig{ + Addons: []KubernetesAddon{ + getMockAddon("addon"), + }, + } + e := c.IsReschedulerEnabled() + if e != DefaultReschedulerAddonEnabled { + t.Fatalf("KubernetesConfig.IsReschedulerEnabled() should return %t when no rescheduler addon has been specified, instead returned %t", DefaultReschedulerAddonEnabled, e) + } + c.Addons = append(c.Addons, getMockAddon("rescheduler")) + e = c.IsReschedulerEnabled() + if e != true { + t.Fatalf("KubernetesConfig.IsReschedulerEnabled() should return true when a custom rescheduler addon has been specified, instead returned %t", e) + } + f := false + c = KubernetesConfig{ + Addons: []KubernetesAddon{ + { + Name: "rescheduler", + Enabled: &f, + }, + }, + } + e = c.IsReschedulerEnabled() + if e != false { + t.Fatalf("KubernetesConfig.IsReschedulerEnabled() should return false when a custom rescheduler addon has been specified as disabled, instead returned %t", e) + } +} + func getMockAddon(name string) KubernetesAddon { return KubernetesAddon{ Name: name, From e4ef91531a117d7d7ff743cef07a29a43023020b Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 16 Nov 2017 15:34:46 -0800 Subject: [PATCH 17/24] parametrize limits/requests --- ...esmasteraddons-kube-rescheduler-deployment.yaml | 7 +++++-- parts/kubernetesmastercustomdata.yml | 8 ++++++++ pkg/acsengine/defaults.go | 14 +++++++------- pkg/api/const.go | 2 +- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml b/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml index e3b6ed128c..cac4d88109 100644 --- a/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml +++ b/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml @@ -24,8 +24,11 @@ spec: name: rescheduler resources: requests: - cpu: 10m - memory: 100Mi + cpu: + memory: + limits: + cpu: + memory: command: - sh - -c diff --git a/parts/kubernetesmastercustomdata.yml b/parts/kubernetesmastercustomdata.yml index f12b90ec95..05b4b2fb71 100644 --- a/parts/kubernetesmastercustomdata.yml +++ b/parts/kubernetesmastercustomdata.yml @@ -140,12 +140,14 @@ write_files: content: !!binary | MASTER_ADDON_HEAPSTER_DEPLOYMENT_B64_GZIP_STR +{{if .OrchestratorProfile.KubernetesConfig.IsReschedulerEnabled}} - path: /etc/kubernetes/addons/kube-rescheduler-deployment.yaml permissions: "0644" encoding: gzip owner: "root" content: !!binary | MASTER_ADDON_RESCHEDULER_DEPLOYMENT_B64_GZIP_STR +{{end}} - path: /etc/kubernetes/addons/azure-storage-classes.yaml permissions: "0644" @@ -291,7 +293,13 @@ write_files: sed -i "s||{{WrapAsVariable "kubernetesTillerCPULimit"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesTillerMemoryLimit"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" {{end}} +{{if .OrchestratorProfile.KubernetesConfig.IsReschedulerEnabled}} sed -i "s||{{WrapAsVariable "kubernetesReschedulerSpec"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" + sed -i "s||{{WrapAsVariable "kubernetesReschedulerCPURequests"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" + sed -i "s||{{WrapAsVariable "kubernetesReschedulerMemoryRequests"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" + sed -i "s||{{WrapAsVariable "kubernetesReschedulerCPULimit"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" + sed -i "s||{{WrapAsVariable "kubernetesReschedulerMemoryLimit"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" + {{end}} sed -i "s||{{WrapAsVariable "kubeDNSServiceIP"}}|g" "/etc/kubernetes/addons/kube-dns-deployment.yaml" {{if .OrchestratorProfile.KubernetesConfig.EnableRbac }} diff --git a/pkg/acsengine/defaults.go b/pkg/acsengine/defaults.go index caeba6e6ae..9111debb09 100644 --- a/pkg/acsengine/defaults.go +++ b/pkg/acsengine/defaults.go @@ -152,7 +152,7 @@ var ( // DefaultTillerAddonsConfig is the default tiller Kubernetes addon Config DefaultTillerAddonsConfig = api.KubernetesAddon{ Name: DefaultTillerAddonName, - Enabled: pointerToBool(true), + Enabled: pointerToBool(api.DefaultTillerAddonEnabled), Containers: []api.KubernetesContainerSpec{ { Name: DefaultTillerAddonName, @@ -167,7 +167,7 @@ var ( // DefaultDashboardAddonsConfig is the default kubernetes-dashboard addon Config DefaultDashboardAddonsConfig = api.KubernetesAddon{ Name: DefaultDashboardAddonName, - Enabled: pointerToBool(true), + Enabled: pointerToBool(api.DefaultDashboardAddonEnabled), Containers: []api.KubernetesContainerSpec{ { Name: DefaultDashboardAddonName, @@ -182,14 +182,14 @@ var ( // DefaultReschedulerAddonsConfig is the default rescheduler Kubernetes addon Config DefaultReschedulerAddonsConfig = api.KubernetesAddon{ Name: DefaultReschedulerAddonName, - Enabled: pointerToBool(true), + Enabled: pointerToBool(api.DefaultReschedulerAddonEnabled), Containers: []api.KubernetesContainerSpec{ { Name: DefaultReschedulerAddonName, - CPURequests: "300m", - MemoryRequests: "150Mi", - CPULimits: "300m", - MemoryLimits: "150Mi", + CPURequests: "10m", + MemoryRequests: "100Mi", + CPULimits: "10m", + MemoryLimits: "100Mi", }, }, } diff --git a/pkg/api/const.go b/pkg/api/const.go index ec24b956a7..f6ad17ad2c 100644 --- a/pkg/api/const.go +++ b/pkg/api/const.go @@ -87,5 +87,5 @@ const ( // DefaultDashboardAddonEnabled determines the acs-engine provided default for enabling kubernetes-dashboard addon DefaultDashboardAddonEnabled = true // DefaultReschedulerAddonEnabled determines the acs-engine provided default for enabling kubernetes-rescheduler addon - DefaultReschedulerAddonEnabled = true + DefaultReschedulerAddonEnabled = false ) From c0b3f35eb7a13e3d51bf4620a4016c4ac7ef27be Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 16 Nov 2017 15:41:31 -0800 Subject: [PATCH 18/24] fix types test for isReschedulerEnabled --- pkg/api/types_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/api/types_test.go b/pkg/api/types_test.go index 55ea952c5d..b69104d601 100644 --- a/pkg/api/types_test.go +++ b/pkg/api/types_test.go @@ -156,21 +156,21 @@ func TestIsReschedulerEnabled(t *testing.T) { } c.Addons = append(c.Addons, getMockAddon("rescheduler")) e = c.IsReschedulerEnabled() - if e != true { + if e != false { t.Fatalf("KubernetesConfig.IsReschedulerEnabled() should return true when a custom rescheduler addon has been specified, instead returned %t", e) } - f := false + t := true c = KubernetesConfig{ Addons: []KubernetesAddon{ { Name: "rescheduler", - Enabled: &f, + Enabled: &t, }, }, } e = c.IsReschedulerEnabled() - if e != false { - t.Fatalf("KubernetesConfig.IsReschedulerEnabled() should return false when a custom rescheduler addon has been specified as disabled, instead returned %t", e) + if e != true { + t.Fatalf("KubernetesConfig.IsReschedulerEnabled() should return false when a custom rescheduler addon has been specified as enabled, instead returned %t", e) } } From e69d7b7a32269c5e2d78d57c596b458932ff950b Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 16 Nov 2017 15:47:52 -0800 Subject: [PATCH 19/24] fix var name in test --- pkg/api/types_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/api/types_test.go b/pkg/api/types_test.go index b69104d601..b7960abb14 100644 --- a/pkg/api/types_test.go +++ b/pkg/api/types_test.go @@ -99,12 +99,12 @@ func TestIsTillerEnabled(t *testing.T) { if e != true { t.Fatalf("KubernetesConfig.IsTillerEnabled() should return true when a custom tiller addon has been specified, instead returned %t", e) } - f := false + b := false c = KubernetesConfig{ Addons: []KubernetesAddon{ { Name: "tiller", - Enabled: &f, + Enabled: &b, }, }, } @@ -129,12 +129,12 @@ func TestIsDashboardEnabled(t *testing.T) { if e != true { t.Fatalf("KubernetesConfig.IsDashboardEnabled() should return true when a custom kubernetes-dashboard addon has been specified, instead returned %t", e) } - f := false + b := false c = KubernetesConfig{ Addons: []KubernetesAddon{ { Name: "kubernetes-dashboard", - Enabled: &f, + Enabled: &b, }, }, } @@ -159,12 +159,12 @@ func TestIsReschedulerEnabled(t *testing.T) { if e != false { t.Fatalf("KubernetesConfig.IsReschedulerEnabled() should return true when a custom rescheduler addon has been specified, instead returned %t", e) } - t := true + b := true c = KubernetesConfig{ Addons: []KubernetesAddon{ { Name: "rescheduler", - Enabled: &t, + Enabled: &b, }, }, } From 35d65f0d678395623aa864e5cf8dca992c3cff1d Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 16 Nov 2017 16:21:12 -0800 Subject: [PATCH 20/24] added rescheduler limit params --- parts/kubernetesmastervars.t | 4 ++++ parts/kubernetesparams.t | 28 ++++++++++++++++++++++++++++ pkg/acsengine/engine.go | 12 ++++++------ 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/parts/kubernetesmastervars.t b/parts/kubernetesmastervars.t index 52f7137105..59a0273a23 100644 --- a/parts/kubernetesmastervars.t +++ b/parts/kubernetesmastervars.t @@ -26,6 +26,10 @@ "kubernetesTillerCPULimit": "[parameters('kubernetesTillerCPULimit')]", "kubernetesTillerMemoryLimit": "[parameters('kubernetesTillerMemoryLimit')]", "kubernetesReschedulerSpec": "[parameters('kubernetesReschedulerSpec')]", + "kubernetesReschedulerCPURequests": "[parameters('kubernetesReschedulerCPURequests')]", + "kubernetesReschedulerMemoryRequests": "[parameters('kubernetesReschedulerMemoryRequests')]", + "kubernetesReschedulerCPULimit": "[parameters('kubernetesReschedulerCPULimit')]", + "kubernetesReschedulerMemoryLimit": "[parameters('kubernetesReschedulerMemoryLimit')]", "kubernetesPodInfraContainerSpec": "[parameters('kubernetesPodInfraContainerSpec')]", "kubernetesNodeStatusUpdateFrequency": "[parameters('kubernetesNodeStatusUpdateFrequency')]", "kubernetesCtrlMgrNodeMonitorGracePeriod": "[parameters('kubernetesCtrlMgrNodeMonitorGracePeriod')]", diff --git a/parts/kubernetesparams.t b/parts/kubernetesparams.t index c317d64c08..da09ef0fab 100644 --- a/parts/kubernetesparams.t +++ b/parts/kubernetesparams.t @@ -232,6 +232,34 @@ }, "type": "string" }, + "kubernetesReschedulerCPURequests": { + {{PopulateClassicModeDefaultValue "kubernetesReschedulerCPURequests"}} + "metadata": { + "description": "Rescheduler CPU Requests." + }, + "type": "string" + }, + "kubernetesReschedulerMemoryRequests": { + {{PopulateClassicModeDefaultValue "kubernetesReschedulerMemoryRequests"}} + "metadata": { + "description": "Rescheduler Memory Requests." + }, + "type": "string" + }, + "kubernetesReschedulerCPULimit": { + {{PopulateClassicModeDefaultValue "kubernetesReschedulerCPULimit"}} + "metadata": { + "description": "Rescheduler CPU Limit." + }, + "type": "string" + }, + "kubernetesReschedulerMemoryLimit": { + {{PopulateClassicModeDefaultValue "kubernetesReschedulerMemoryLimit"}} + "metadata": { + "description": "Rescheduler Memory Limit." + }, + "type": "string" + }, "kubernetesPodInfraContainerSpec": { {{PopulateClassicModeDefaultValue "kubernetesPodInfraContainerSpec"}} "metadata": { diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go index 19ee3fa26e..b296f882a6 100644 --- a/pkg/acsengine/engine.go +++ b/pkg/acsengine/engine.go @@ -1277,33 +1277,33 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat } case "kubernetesReschedulerSpec": if rC > -1 { - if dashboardAddon.Containers[rC].Image != "" { - val = dashboardAddon.Containers[rC].Image + if reschedulerAddon.Containers[rC].Image != "" { + val = reschedulerAddon.Containers[rC].Image } } else { val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion][DefaultReschedulerAddonName] } case "kubernetesReschedulerCPURequests": if rC > -1 { - val = dashboardAddon.Containers[rC].CPURequests + val = reschedulerAddon.Containers[rC].CPURequests } else { val = "" } case "kubernetesReschedulerMemoryRequests": if rC > -1 { - val = dashboardAddon.Containers[rC].MemoryRequests + val = reschedulerAddon.Containers[rC].MemoryRequests } else { val = "" } case "kubernetesReschedulerCPULimit": if rC > -1 { - val = dashboardAddon.Containers[rC].CPULimits + val = reschedulerAddon.Containers[rC].CPULimits } else { val = "" } case "kubernetesReschedulerMemoryLimit": if rC > -1 { - val = dashboardAddon.Containers[rC].MemoryLimits + val = reschedulerAddon.Containers[rC].MemoryLimits } else { val = "" } From 3beedcdfdd5b70956c6e772ebcb8082595af4523 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Fri, 17 Nov 2017 09:56:51 -0800 Subject: [PATCH 21/24] fixed pr comments --- parts/kubernetesmastercustomdata.yml | 7 +++++-- pkg/acsengine/defaults.go | 2 +- pkg/api/const.go | 6 ++++++ pkg/api/types.go | 6 +++--- pkg/api/types_test.go | 12 ++++++------ 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/parts/kubernetesmastercustomdata.yml b/parts/kubernetesmastercustomdata.yml index 05b4b2fb71..2826b08d49 100644 --- a/parts/kubernetesmastercustomdata.yml +++ b/parts/kubernetesmastercustomdata.yml @@ -279,6 +279,8 @@ write_files: sed -i "s||{{WrapAsVariable "kubernetesHyperkubeSpec"}}|g; s||{{WrapAsVariable "kubeClusterCidr"}}|g" "/etc/kubernetes/addons/kube-proxy-daemonset.yaml" sed -i "s||{{WrapAsVariable "kubernetesKubeDNSSpec"}}|g; s||{{WrapAsVariable "kubernetesDNSMasqSpec"}}|g; s||{{WrapAsVariable "kubernetesExecHealthzSpec"}}|g" "/etc/kubernetes/addons/kube-dns-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesHeapsterSpec"}}|g; s||{{WrapAsVariable "kubernetesAddonResizerSpec"}}|g" "/etc/kubernetes/addons/kube-heapster-deployment.yaml" + sed -i "s||{{WrapAsVariable "kubeDNSServiceIP"}}|g" "/etc/kubernetes/addons/kube-dns-deployment.yaml" + {{if .OrchestratorProfile.KubernetesConfig.IsDashboardEnabled}} sed -i "s||{{WrapAsVariable "kubernetesDashboardSpec"}}|g" "/etc/kubernetes/addons/kubernetes-dashboard-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesDashboardCPURequests"}}|g" "/etc/kubernetes/addons/kubernetes-dashboard-deployment.yaml" @@ -286,6 +288,7 @@ write_files: sed -i "s||{{WrapAsVariable "kubernetesDashboardCPULimit"}}|g" "/etc/kubernetes/addons/kubernetes-dashboard-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesDashboardMemoryLimit"}}|g" "/etc/kubernetes/addons/kubernetes-dashboard-deployment.yaml" {{end}} + {{if .OrchestratorProfile.KubernetesConfig.IsTillerEnabled}} sed -i "s||{{WrapAsVariable "kubernetesTillerSpec"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesTillerCPURequests"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" @@ -293,14 +296,14 @@ write_files: sed -i "s||{{WrapAsVariable "kubernetesTillerCPULimit"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesTillerMemoryLimit"}}|g" "/etc/kubernetes/addons/kube-tiller-deployment.yaml" {{end}} + {{if .OrchestratorProfile.KubernetesConfig.IsReschedulerEnabled}} sed -i "s||{{WrapAsVariable "kubernetesReschedulerSpec"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesReschedulerCPURequests"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesReschedulerMemoryRequests"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesReschedulerCPULimit"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesReschedulerMemoryLimit"}}|g" "/etc/kubernetes/addons/kube-rescheduler-deployment.yaml" - {{end}} - sed -i "s||{{WrapAsVariable "kubeDNSServiceIP"}}|g" "/etc/kubernetes/addons/kube-dns-deployment.yaml" +{{end}} {{if .OrchestratorProfile.KubernetesConfig.EnableRbac }} # If RBAC enabled then add parameters to API server and Controller manager configuration diff --git a/pkg/acsengine/defaults.go b/pkg/acsengine/defaults.go index 9111debb09..ece2d0dae5 100644 --- a/pkg/acsengine/defaults.go +++ b/pkg/acsengine/defaults.go @@ -357,7 +357,7 @@ func setOrchestratorDefaults(cs *api.ContainerService) { } r := getAddonsIndexByName(a.OrchestratorProfile.KubernetesConfig.Addons, DefaultReschedulerAddonName) if a.OrchestratorProfile.KubernetesConfig.Addons[r].IsEnabled(api.DefaultReschedulerAddonEnabled) { - a.OrchestratorProfile.KubernetesConfig.Addons[r] = assignDefaultAddonVals(a.OrchestratorProfile.KubernetesConfig.Addons[r], DefaultDashboardAddonsConfig) + a.OrchestratorProfile.KubernetesConfig.Addons[r] = assignDefaultAddonVals(a.OrchestratorProfile.KubernetesConfig.Addons[r], DefaultReschedulerAddonsConfig) } if "" == a.OrchestratorProfile.KubernetesConfig.EtcdDiskSizeGB { diff --git a/pkg/api/const.go b/pkg/api/const.go index f6ad17ad2c..531e1e6a01 100644 --- a/pkg/api/const.go +++ b/pkg/api/const.go @@ -88,4 +88,10 @@ const ( DefaultDashboardAddonEnabled = true // DefaultReschedulerAddonEnabled determines the acs-engine provided default for enabling kubernetes-rescheduler addon DefaultReschedulerAddonEnabled = false + // DefaultTillerAddonName is the name of the tiller addon deployment + DefaultTillerAddonName = "tiller" + // DefaultDashboardAddonName is the name of the kubernetes-dashboard addon deployment + DefaultDashboardAddonName = "kubernetes-dashboard" + // DefaultReschedulerAddonName is the name of the rescheduler addon deployment + DefaultReschedulerAddonName = "rescheduler" ) diff --git a/pkg/api/types.go b/pkg/api/types.go index 3a032dfe4d..e4c81fa2df 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -582,7 +582,7 @@ func (o *OrchestratorProfile) GetAPIServerEtcdAPIVersion() string { func (k *KubernetesConfig) IsTillerEnabled() bool { var tillerAddon KubernetesAddon for i := range k.Addons { - if k.Addons[i].Name == "tiller" { + if k.Addons[i].Name == DefaultTillerAddonName { tillerAddon = k.Addons[i] } } @@ -593,7 +593,7 @@ func (k *KubernetesConfig) IsTillerEnabled() bool { func (k *KubernetesConfig) IsDashboardEnabled() bool { var dashboardAddon KubernetesAddon for i := range k.Addons { - if k.Addons[i].Name == "kubernetes-dashboard" { + if k.Addons[i].Name == DefaultDashboardAddonName { dashboardAddon = k.Addons[i] } } @@ -604,7 +604,7 @@ func (k *KubernetesConfig) IsDashboardEnabled() bool { func (k *KubernetesConfig) IsReschedulerEnabled() bool { var reschedulerAddon KubernetesAddon for i := range k.Addons { - if k.Addons[i].Name == "rescheduler" { + if k.Addons[i].Name == DefaultReschedulerAddonName { reschedulerAddon = k.Addons[i] } } diff --git a/pkg/api/types_test.go b/pkg/api/types_test.go index b7960abb14..749290ace3 100644 --- a/pkg/api/types_test.go +++ b/pkg/api/types_test.go @@ -94,7 +94,7 @@ func TestIsTillerEnabled(t *testing.T) { if e != DefaultTillerAddonEnabled { t.Fatalf("KubernetesConfig.IsTillerEnabled() should return %t when no tiller addon has been specified, instead returned %t", DefaultTillerAddonEnabled, e) } - c.Addons = append(c.Addons, getMockAddon("tiller")) + c.Addons = append(c.Addons, getMockAddon(DefaultTillerAddonName)) e = c.IsTillerEnabled() if e != true { t.Fatalf("KubernetesConfig.IsTillerEnabled() should return true when a custom tiller addon has been specified, instead returned %t", e) @@ -103,7 +103,7 @@ func TestIsTillerEnabled(t *testing.T) { c = KubernetesConfig{ Addons: []KubernetesAddon{ { - Name: "tiller", + Name: DefaultTillerAddonName, Enabled: &b, }, }, @@ -124,7 +124,7 @@ func TestIsDashboardEnabled(t *testing.T) { if e != DefaultDashboardAddonEnabled { t.Fatalf("KubernetesConfig.IsDashboardEnabled() should return %t when no kubernetes-dashboard addon has been specified, instead returned %t", DefaultDashboardAddonEnabled, e) } - c.Addons = append(c.Addons, getMockAddon("kubernetes-dashboard")) + c.Addons = append(c.Addons, getMockAddon(DefaultDashboardAddonName)) e = c.IsDashboardEnabled() if e != true { t.Fatalf("KubernetesConfig.IsDashboardEnabled() should return true when a custom kubernetes-dashboard addon has been specified, instead returned %t", e) @@ -133,7 +133,7 @@ func TestIsDashboardEnabled(t *testing.T) { c = KubernetesConfig{ Addons: []KubernetesAddon{ { - Name: "kubernetes-dashboard", + Name: DefaultDashboardAddonName, Enabled: &b, }, }, @@ -154,7 +154,7 @@ func TestIsReschedulerEnabled(t *testing.T) { if e != DefaultReschedulerAddonEnabled { t.Fatalf("KubernetesConfig.IsReschedulerEnabled() should return %t when no rescheduler addon has been specified, instead returned %t", DefaultReschedulerAddonEnabled, e) } - c.Addons = append(c.Addons, getMockAddon("rescheduler")) + c.Addons = append(c.Addons, getMockAddon(DefaultReschedulerAddonName)) e = c.IsReschedulerEnabled() if e != false { t.Fatalf("KubernetesConfig.IsReschedulerEnabled() should return true when a custom rescheduler addon has been specified, instead returned %t", e) @@ -163,7 +163,7 @@ func TestIsReschedulerEnabled(t *testing.T) { c = KubernetesConfig{ Addons: []KubernetesAddon{ { - Name: "rescheduler", + Name: DefaultReschedulerAddonName, Enabled: &b, }, }, From 8823cb34d941f97aad9f224704f4691bbd827827 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Fri, 17 Nov 2017 10:05:29 -0800 Subject: [PATCH 22/24] removed extra line --- pkg/acsengine/engine.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go index b296f882a6..80d08a0631 100644 --- a/pkg/acsengine/engine.go +++ b/pkg/acsengine/engine.go @@ -548,7 +548,6 @@ func getParameters(cs *api.ContainerService, isClassicMode bool, generatorCode s addValue(parametersMap, "kubernetesDNSMasqSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["dnsmasq"]) addValue(parametersMap, "kubernetesExecHealthzSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["exechealthz"]) addValue(parametersMap, "kubernetesHeapsterSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["heapster"]) - addValue(parametersMap, "kubernetesReschedulerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["rescheduler"]) tillerAddon := getAddonByName(properties.OrchestratorProfile.KubernetesConfig.Addons, DefaultTillerAddonName) c := getAddonContainersIndexByName(tillerAddon.Containers, DefaultTillerAddonName) if c > -1 { From 083ec7d15bedaf03145417b3b85b311d70630b44 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Fri, 17 Nov 2017 11:12:05 -0800 Subject: [PATCH 23/24] add rescheduler regression test + added docs + fixed dashboard name in docs --- docs/clusterdefinition.md | 3 +- .../kubernetes-no-dashboard.json | 2 +- .../kubernetes-rescheduler.json | 43 +++++++++++++++++++ test/acse-conf/acse-regression.json | 6 ++- 4 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 examples/kubernetes-config/kubernetes-rescheduler.json diff --git a/docs/clusterdefinition.md b/docs/clusterdefinition.md index 09f2ddf205..0e89932ca0 100644 --- a/docs/clusterdefinition.md +++ b/docs/clusterdefinition.md @@ -49,6 +49,7 @@ Here are the valid values for the orchestrator types: |Name of addon|Enabled by default?|How many containers|Description| |tiller|true|Delivers the Helm server-side component: tiller. See https://github.com/kubernetes/helm for more info.| |kubernetes-dashboard|true|1|Delivers the kubernetes dashboard component. See https://github.com/kubernetes/dashboard for more info.| +|rescheduler|false|Delivers the kubernetes rescheduler component.| To give a bit more info on the `addons` property: We've tried to expose the basic bits of data that allow useful configuration of these cluster features. Here are some example usage patterns that will unpack what `addons` provide: @@ -75,7 +76,7 @@ As you can see above, `addons` is an array child property of `kubernetesConfig`. "enabled" : false }, { - "name": "dashboard", + "name": "kubernetes-dashboard", "enabled" : false } ] diff --git a/examples/kubernetes-config/kubernetes-no-dashboard.json b/examples/kubernetes-config/kubernetes-no-dashboard.json index f044de08f5..0ddd636f6d 100644 --- a/examples/kubernetes-config/kubernetes-no-dashboard.json +++ b/examples/kubernetes-config/kubernetes-no-dashboard.json @@ -6,7 +6,7 @@ "kubernetesConfig": { "addons": [ { - "name": "dashboard", + "name": "kubernetes-dashboard", "enabled" : false } ] diff --git a/examples/kubernetes-config/kubernetes-rescheduler.json b/examples/kubernetes-config/kubernetes-rescheduler.json new file mode 100644 index 0000000000..c85444586f --- /dev/null +++ b/examples/kubernetes-config/kubernetes-rescheduler.json @@ -0,0 +1,43 @@ +{ + "apiVersion": "vlabs", + "properties": { + "orchestratorProfile": { + "orchestratorType": "Kubernetes", + "kubernetesConfig": { + "addons": [ + { + "name": "rescheduler", + "enabled" : true + } + ] + } + }, + "masterProfile": { + "count": 1, + "dnsPrefix": "", + "vmSize": "Standard_D2_v2" + }, + "agentPoolProfiles": [ + { + "name": "agentpool1", + "count": 1, + "vmSize": "Standard_D2_v2", + "availabilityProfile": "AvailabilitySet" + } + ], + "linuxProfile": { + "adminUsername": "azureUser", + "ssh": { + "publicKeys": [ + { + "keyData": "" + } + ] + } + }, + "servicePrincipalProfile": { + "clientId": "", + "secret": "" + } + } +} diff --git a/test/acse-conf/acse-regression.json b/test/acse-conf/acse-regression.json index 3f76898a27..2a97c66e4c 100644 --- a/test/acse-conf/acse-regression.json +++ b/test/acse-conf/acse-regression.json @@ -77,6 +77,10 @@ "cluster_definition": "kubernetes-config/kubernetes-no-dashboard.json", "category": "config" }, + { + "cluster_definition": "kubernetes-config/kubernetes-rescheduler.json", + "category": "config" + }, { "cluster_definition": "v20170131/swarmmode.json", "category": "version" @@ -94,4 +98,4 @@ "category": "network" } ] -} +} \ No newline at end of file From ee7e85061681428f40fd9fb046753f985fadb7e0 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Fri, 17 Nov 2017 11:17:00 -0800 Subject: [PATCH 24/24] typo fix --- parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml b/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml index cac4d88109..fc62947df0 100644 --- a/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml +++ b/parts/kubernetesmasteraddons-kube-rescheduler-deployment.yaml @@ -25,7 +25,7 @@ spec: resources: requests: cpu: - memory: + memory: limits: cpu: memory: