Azure
/
aks-engine
зеркало из https://github.com/Azure/aks-engine.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update to go 1.11 and fix new linting errors (#3763) 

* update go-dev-tools image

See https://github.com/deis/docker-go-dev/releases/tag/v1.15.0

* Fix new go vet errors in go 1.11

* Update go-dev image to 1.15.1 for goimports fix.

The "goimports" binary/plugin needed to be built with go 1.11.

* Update go-dev image to 1.16.0 for parity with AKS

* Test just headers of SSH keys

Go 1.11 now randomizes rsa.GenerateKey to prevent exactly this
type of implementation-specific test.

* Update go-dev image to 1.17.0 for party with AKS

* Add private key length and validation tests
This commit is contained in:
Matt Boersma 2018-09-12 10:34:30 -06:00 коммит произвёл GitHub
Родитель 3c7ebbe9e9
Коммит 353c8bb50c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
14 изменённых файлов: 151 добавлений и 197 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
.circleci/config.yml
Просмотреть файл

@ -3,7 +3,7 @@ version: 2
defaults: &defaults
working_directory: /go/src/github.com/Azure/acs-engine
docker:
- image: quay.io/deis/go-dev:v1.14.0
- image: quay.io/deis/go-dev:v1.17.0
environment:
GOPATH: /go

4
Makefile
Просмотреть файл

@ -25,7 +25,7 @@ GITTAG := $(VERSION_SHORT)
endif
REPO_PATH := github.com/Azure/acs-engine
DEV_ENV_IMAGE := quay.io/deis/go-dev:v1.14.0
DEV_ENV_IMAGE := quay.io/deis/go-dev:v1.17.0
DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
DEV_ENV_OPTS := --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_VARS}
DEV_ENV_CMD := docker run ${DEV_ENV_OPTS} ${DEV_ENV_IMAGE}
@ -157,4 +157,4 @@ devenv:
include versioning.mk
include test.mk
include packer.mk
include packer.mk

2
cmd/deploy.go
Просмотреть файл

@ -166,7 +166,7 @@ func (dc *deployCmd) mergeAPIModel() error {
// overrides the api model and generates a new file
dc.apimodelPath, err = transform.MergeValuesWithAPIModel(dc.apimodelPath, m)
if err != nil {
return errors.Wrapf(err, "error merging --set values with the api model: %s")
return errors.Wrapf(err, "error merging --set values with the api model: %s", dc.apimodelPath)
}
log.Infoln(fmt.Sprintf("new api model file has been generated during merge: %s", dc.apimodelPath))

2
makedev.ps1
Просмотреть файл

@ -1,5 +1,5 @@
$REPO_PATH = "github.com/Azure/acs-engine"
$DEV_ENV_IMAGE = "quay.io/deis/go-dev:v1.14.0"
$DEV_ENV_IMAGE = "quay.io/deis/go-dev:v1.17.0"
$DEV_ENV_WORK_DIR = "/go/src/$REPO_PATH"
docker.exe run -it --rm -w $DEV_ENV_WORK_DIR -v `"$($PWD)`":$DEV_ENV_WORK_DIR $DEV_ENV_IMAGE bash

118
pkg/acsengine/k8s_versions.go
Просмотреть файл

@ -282,15 +282,15 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
switch majorMinor {
case "1.12":
ret = map[string]string{
"hyperkube": "hyperkube-amd64:v" + version,
"ccm": "cloud-controller-manager-amd64:v" + version,
"windowszip": "v" + version + "-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.12"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.12"]["dashboard"],
"exechealthz": k8sComponentVersions["1.12"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.12"]["addon-resizer"],
"heapster": k8sComponentVersions["1.12"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.12"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v" + version,
"ccm": "cloud-controller-manager-amd64:v" + version,
"windowszip": "v" + version + "-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.12"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.12"]["dashboard"],
"exechealthz": k8sComponentVersions["1.12"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.12"]["addon-resizer"],
"heapster": k8sComponentVersions["1.12"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.12"]["metrics-server"],
"dns": k8sComponentVersions["1.12"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.12"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.12"]["dnsmasq"],
@ -318,15 +318,15 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
}
case "1.11":
ret = map[string]string{
"hyperkube": "hyperkube-amd64:v" + version,
"ccm": "cloud-controller-manager-amd64:v" + version,
"windowszip": "v" + version + "-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.11"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.11"]["dashboard"],
"exechealthz": k8sComponentVersions["1.11"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.11"]["addon-resizer"],
"heapster": k8sComponentVersions["1.11"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.11"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v" + version,
"ccm": "cloud-controller-manager-amd64:v" + version,
"windowszip": "v" + version + "-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.11"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.11"]["dashboard"],
"exechealthz": k8sComponentVersions["1.11"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.11"]["addon-resizer"],
"heapster": k8sComponentVersions["1.11"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.11"]["metrics-server"],
"dns": k8sComponentVersions["1.11"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.11"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.11"]["dnsmasq"],
@ -354,15 +354,15 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
}
case "1.10":
ret = map[string]string{
"hyperkube": "hyperkube-amd64:v" + version,
"ccm": "cloud-controller-manager-amd64:v" + version,
"windowszip": "v" + version + "-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.10"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.10"]["dashboard"],
"exechealthz": k8sComponentVersions["1.10"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.10"]["addon-resizer"],
"heapster": k8sComponentVersions["1.10"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.10"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v" + version,
"ccm": "cloud-controller-manager-amd64:v" + version,
"windowszip": "v" + version + "-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.10"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.10"]["dashboard"],
"exechealthz": k8sComponentVersions["1.10"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.10"]["addon-resizer"],
"heapster": k8sComponentVersions["1.10"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.10"]["metrics-server"],
"dns": k8sComponentVersions["1.10"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.10"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.10"]["dnsmasq"],
@ -390,15 +390,15 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
}
case "1.9":
ret = map[string]string{
"hyperkube": "hyperkube-amd64:v" + version,
"ccm": "cloud-controller-manager-amd64:v" + version,
"windowszip": "v" + version + "-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.9"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.9"]["dashboard"],
"exechealthz": k8sComponentVersions["1.9"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.9"]["addon-resizer"],
"heapster": k8sComponentVersions["1.9"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.9"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v" + version,
"ccm": "cloud-controller-manager-amd64:v" + version,
"windowszip": "v" + version + "-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.9"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.9"]["dashboard"],
"exechealthz": k8sComponentVersions["1.9"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.9"]["addon-resizer"],
"heapster": k8sComponentVersions["1.9"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.9"]["metrics-server"],
"dns": k8sComponentVersions["1.9"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.9"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.9"]["dnsmasq"],
@ -425,15 +425,15 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
}
case "1.8":
ret = map[string]string{
"hyperkube": "hyperkube-amd64:v" + version,
"ccm": "cloud-controller-manager-amd64:v" + version,
"windowszip": "v" + version + "-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.8"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.8"]["dashboard"],
"exechealthz": k8sComponentVersions["1.8"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.8"]["addon-resizer"],
"heapster": k8sComponentVersions["1.8"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.8"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v" + version,
"ccm": "cloud-controller-manager-amd64:v" + version,
"windowszip": "v" + version + "-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.8"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.8"]["dashboard"],
"exechealthz": k8sComponentVersions["1.8"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.8"]["addon-resizer"],
"heapster": k8sComponentVersions["1.8"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.8"]["metrics-server"],
"dns": k8sComponentVersions["1.8"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.8"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.8"]["dnsmasq"],
@ -458,13 +458,13 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
}
case "1.7":
ret = map[string]string{
"hyperkube": "hyperkube-amd64:v" + version,
"dockerEngineVersion": k8sComponentVersions["1.7"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.7"]["dashboard"],
"exechealthz": k8sComponentVersions["1.7"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.7"]["addon-resizer"],
"heapster": k8sComponentVersions["1.7"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.7"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v" + version,
"dockerEngineVersion": k8sComponentVersions["1.7"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.7"]["dashboard"],
"exechealthz": k8sComponentVersions["1.7"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.7"]["addon-resizer"],
"heapster": k8sComponentVersions["1.7"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.7"]["metrics-server"],
"dns": k8sComponentVersions["1.7"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.7"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.7"]["dnsmasq"],
@ -489,13 +489,13 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
}
case "1.6":
ret = map[string]string{
"hyperkube": "hyperkube-amd64:v" + version,
"dockerEngineVersion": k8sComponentVersions["1.6"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.6"]["dashboard"],
"exechealthz": k8sComponentVersions["1.6"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.6"]["addon-resizer"],
"heapster": k8sComponentVersions["1.6"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.6"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v" + version,
"dockerEngineVersion": k8sComponentVersions["1.6"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.6"]["dashboard"],
"exechealthz": k8sComponentVersions["1.6"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.6"]["addon-resizer"],
"heapster": k8sComponentVersions["1.6"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.6"]["metrics-server"],
"dns": k8sComponentVersions["1.6"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.6"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.6"]["dnsmasq"],

104
pkg/acsengine/k8s_versions_test.go
Просмотреть файл

@ -11,15 +11,15 @@ func TestGetK8sVersionComponents(t *testing.T) {
t.Fatalf("getK8sVersionComponents() should not return nil for valid version")
}
expected := map[string]string{
"hyperkube": "hyperkube-amd64:v1.11.0-alpha.1",
"ccm": "cloud-controller-manager-amd64:v1.11.0-alpha.1",
"windowszip": "v1.11.0-alpha.1-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.11"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.11"]["dashboard"],
"exechealthz": k8sComponentVersions["1.11"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.11"]["addon-resizer"],
"heapster": k8sComponentVersions["1.11"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.11"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v1.11.0-alpha.1",
"ccm": "cloud-controller-manager-amd64:v1.11.0-alpha.1",
"windowszip": "v1.11.0-alpha.1-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.11"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.11"]["dashboard"],
"exechealthz": k8sComponentVersions["1.11"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.11"]["addon-resizer"],
"heapster": k8sComponentVersions["1.11"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.11"]["metrics-server"],
"dns": k8sComponentVersions["1.11"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.11"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.11"]["dnsmasq"],
@ -57,15 +57,15 @@ func TestGetK8sVersionComponents(t *testing.T) {
t.Fatalf("getK8sVersionComponents() should not return nil for valid version")
}
expected = map[string]string{
"hyperkube": "hyperkube-amd64:v1.10.0",
"ccm": "cloud-controller-manager-amd64:v1.10.0",
"windowszip": "v1.10.0-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.10"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.10"]["dashboard"],
"exechealthz": k8sComponentVersions["1.10"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.10"]["addon-resizer"],
"heapster": k8sComponentVersions["1.10"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.10"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v1.10.0",
"ccm": "cloud-controller-manager-amd64:v1.10.0",
"windowszip": "v1.10.0-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.10"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.10"]["dashboard"],
"exechealthz": k8sComponentVersions["1.10"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.10"]["addon-resizer"],
"heapster": k8sComponentVersions["1.10"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.10"]["metrics-server"],
"dns": k8sComponentVersions["1.10"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.10"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.10"]["dnsmasq"],
@ -103,15 +103,15 @@ func TestGetK8sVersionComponents(t *testing.T) {
t.Fatalf("getK8sVersionComponents() should not return nil for valid version")
}
expected = map[string]string{
"hyperkube": "hyperkube-amd64:v1.9.3",
"ccm": "cloud-controller-manager-amd64:v1.9.3",
"windowszip": "v1.9.3-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.9"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.9"]["dashboard"],
"exechealthz": k8sComponentVersions["1.9"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.9"]["addon-resizer"],
"heapster": k8sComponentVersions["1.9"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.9"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v1.9.3",
"ccm": "cloud-controller-manager-amd64:v1.9.3",
"windowszip": "v1.9.3-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.9"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.9"]["dashboard"],
"exechealthz": k8sComponentVersions["1.9"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.9"]["addon-resizer"],
"heapster": k8sComponentVersions["1.9"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.9"]["metrics-server"],
"dns": k8sComponentVersions["1.9"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.9"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.9"]["dnsmasq"],
@ -148,15 +148,15 @@ func TestGetK8sVersionComponents(t *testing.T) {
t.Fatalf("getK8sVersionComponents() should not return nil for valid version")
}
expected = map[string]string{
"hyperkube": "hyperkube-amd64:v1.8.8",
"ccm": "cloud-controller-manager-amd64:v1.8.8",
"windowszip": "v1.8.8-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.8"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.8"]["dashboard"],
"exechealthz": k8sComponentVersions["1.8"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.8"]["addon-resizer"],
"heapster": k8sComponentVersions["1.8"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.8"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v1.8.8",
"ccm": "cloud-controller-manager-amd64:v1.8.8",
"windowszip": "v1.8.8-1int.zip",
"dockerEngineVersion": k8sComponentVersions["1.8"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.8"]["dashboard"],
"exechealthz": k8sComponentVersions["1.8"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.8"]["addon-resizer"],
"heapster": k8sComponentVersions["1.8"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.8"]["metrics-server"],
"dns": k8sComponentVersions["1.8"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.8"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.8"]["dnsmasq"],
@ -190,13 +190,13 @@ func TestGetK8sVersionComponents(t *testing.T) {
t.Fatalf("getK8sVersionComponents() should not return nil for valid version")
}
expected = map[string]string{
"hyperkube": "hyperkube-amd64:v1.7.13",
"dockerEngineVersion": k8sComponentVersions["1.7"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.7"]["dashboard"],
"exechealthz": k8sComponentVersions["1.7"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.7"]["addon-resizer"],
"heapster": k8sComponentVersions["1.7"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.7"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v1.7.13",
"dockerEngineVersion": k8sComponentVersions["1.7"]["dockerEngine"],
DefaultDashboardAddonName: k8sComponentVersions["1.7"]["dashboard"],
"exechealthz": k8sComponentVersions["1.7"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.7"]["addon-resizer"],
"heapster": k8sComponentVersions["1.7"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.7"]["metrics-server"],
"dns": k8sComponentVersions["1.7"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.7"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.7"]["dnsmasq"],
@ -230,15 +230,15 @@ func TestGetK8sVersionComponents(t *testing.T) {
t.Fatalf("getK8sVersionComponents() should not return nil for valid version")
}
expected = map[string]string{
"hyperkube": "hyperkube-amd64:v1.9.3",
"ccm": "cloud-controller-manager-amd64:v1.9.3",
"windowszip": "v1.9.3-2int.zip",
"dockerEngineVersion": "1.99.*",
DefaultDashboardAddonName: k8sComponentVersions["1.9"]["dashboard"],
"exechealthz": k8sComponentVersions["1.9"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.9"]["addon-resizer"],
"heapster": k8sComponentVersions["1.9"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.9"]["metrics-server"],
"hyperkube": "hyperkube-amd64:v1.9.3",
"ccm": "cloud-controller-manager-amd64:v1.9.3",
"windowszip": "v1.9.3-2int.zip",
"dockerEngineVersion": "1.99.*",
DefaultDashboardAddonName: k8sComponentVersions["1.9"]["dashboard"],
"exechealthz": k8sComponentVersions["1.9"]["exechealthz"],
"addonresizer": k8sComponentVersions["1.9"]["addon-resizer"],
"heapster": k8sComponentVersions["1.9"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.9"]["metrics-server"],
"dns": k8sComponentVersions["1.9"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.9"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.9"]["dnsmasq"],

18
pkg/api/vlabs/validate_test.go
Просмотреть файл

@ -1379,7 +1379,7 @@ func TestMasterProfileValidate(t *testing.T) {
DNSPrefix: "dummy",
VnetSubnetID: "testvnetstring",
FirstConsecutiveStaticIP: "10.0.0.1",
Count: 1,
Count: 1,
},
},
{
@ -1612,10 +1612,10 @@ func TestProperties_ValidateVNET(t *testing.T) {
{
name: "Invalid MasterProfile FirstConsecutiveStaticIP",
masterProfile: &MasterProfile{
VnetSubnetID: validVNetSubnetID,
Count: 1,
DNSPrefix: "foo",
VMSize: "Standard_DS2_v2",
VnetSubnetID: validVNetSubnetID,
Count: 1,
DNSPrefix: "foo",
VMSize: "Standard_DS2_v2",
FirstConsecutiveStaticIP: "10.0.0.invalid",
},
agentPoolProfiles: []*AgentPoolProfile{
@ -1632,10 +1632,10 @@ func TestProperties_ValidateVNET(t *testing.T) {
{
name: "Invalid vnetcidr",
masterProfile: &MasterProfile{
VnetSubnetID: validVNetSubnetID,
Count: 1,
DNSPrefix: "foo",
VMSize: "Standard_DS2_v2",
VnetSubnetID: validVNetSubnetID,
Count: 1,
DNSPrefix: "foo",
VMSize: "Standard_DS2_v2",
FirstConsecutiveStaticIP: "10.0.0.1",
VnetCidr: "10.1.0.0/invalid",
},

72
pkg/helpers/helpers_test.go
Просмотреть файл

@ -5,6 +5,7 @@ import (
"crypto/x509"
"encoding/pem"
"math/rand"
"strings"
"testing"
"github.com/Azure/acs-engine/pkg/i18n"
@ -104,61 +105,6 @@ func TestPointerToInt(t *testing.T) {
func TestCreateSSH(t *testing.T) {
rg := rand.New(rand.NewSource(42))
expectedPublicKeyString := "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCyx5MHXjJvJAx5DJ9FZNIDa/QTWorSF+Ra21Tz49DQWfdSESnCGFFVBh/MQUFGv5kCenbmqEjsWF177kFOdv1vOTz4sKRlHg7u3I9uCyyZQrWx4X4RdNk7eX+isQVjFXYw2W1rRDUrnK/82qVTv1f0gu1DV4Z7GoIa2jfJ0zBUY3IW0VN9jYaPVuwv4t5y2GwSZF+HBRuOfLfiUgt4+qVFOz4KwRaEBsVfWxlidlT3K3/+ztWpFOmaKIOjQreEWV10ZSo3f9g6j/HdMPtwYvRCtYStbFCRmcbPr9nuR84SAX/4f95KvBAKLnXwb5Bt71D2vAlZSW1Ylv2VbcaZ73+43EpyphYCSg3kOCdwsqE/EU+Swued82SguLALD3mNKbxHGJppFjz3GMyPpJuSH5EE1OANyPxABCwCYycKiNWbOPi3l6o4tMrASYRXi8l3l9JCvioUJ3bXXH6cDpcP4P6QgsuxhwVkUiECU+dbjJXK4gAUVuWKkMOdY7ITh82oU3wOWXbk8K3bdIUp2ylcHeAd2pekGMuaEKGbrXGRiBitCEjl67Bj5opQflgSmI63g8Sa3mKOPGRYMI5MXHMVj4Rns5JFHoENuImrlvrbLv3izAwO61vgN7iK26BwzO7jz92fNOHGviejNWYJyi4vZlq07153NZXP8D2xYTebh9hwHQ==\n"
expectedPrivateKeyString := `-----BEGIN RSA PRIVATE KEY-----
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
-----END RSA PRIVATE KEY-----
`
translator := &i18n.Translator{
Locale: nil,
}
@ -174,12 +120,20 @@ EPDesL0rH+3s1CKpgkhYdbJ675GFoGoq+X21QaqsdvoXmmuJF9qq9Tq+JaWloUNq
pemBuffer := bytes.Buffer{}
pem.Encode(&pemBuffer, pemBlock)
if pemBuffer.String() != expectedPrivateKeyString {
t.Fatalf("Private Key did not match expected format/value")
if !strings.HasPrefix(pemBuffer.String(), "-----BEGIN RSA PRIVATE KEY-----") {
t.Fatalf("Private Key did not start with expected header")
}
if publicKey != expectedPublicKeyString {
t.Fatalf("Public Key did not match expected format/value")
if privateKey.N.BitLen() != SSHKeySize {
t.Fatalf("Private Key was of length %d but %d was expected", privateKey.N.BitLen(), SSHKeySize)
}
if err := privateKey.Validate(); err != nil {
t.Fatalf("Private Key failed validation: %v", err)
}
if !strings.HasPrefix(publicKey, "ssh-rsa ") {
t.Fatalf("Public Key did not start with expected header")
}
}

8
pkg/openshift/certgen/release39/kubeconfig.go
Просмотреть файл

@ -106,7 +106,7 @@ func (c *Config) PrepareMasterKubeConfigs() error {
{
Name: externalEndpointName,
Cluster: ClusterInfo{
Server: fmt.Sprintf("https://%s", externalEndpoint),
Server: fmt.Sprintf("https://%s", externalEndpoint),
CertificateAuthorityData: base64.StdEncoding.EncodeToString(cacert),
},
},
@ -139,7 +139,7 @@ func (c *Config) PrepareMasterKubeConfigs() error {
{
Name: localhostEndpointName,
Cluster: ClusterInfo{
Server: fmt.Sprintf("https://%s", localhostEndpoint),
Server: fmt.Sprintf("https://%s", localhostEndpoint),
CertificateAuthorityData: base64.StdEncoding.EncodeToString(cacert),
},
},
@ -172,7 +172,7 @@ func (c *Config) PrepareMasterKubeConfigs() error {
{
Name: endpointName,
Cluster: ClusterInfo{
Server: fmt.Sprintf("https://%s", endpoint),
Server: fmt.Sprintf("https://%s", endpoint),
CertificateAuthorityData: base64.StdEncoding.EncodeToString(cacert),
},
},
@ -231,7 +231,7 @@ func (c *Config) PrepareBootstrapKubeConfig() error {
{
Name: epName,
Cluster: ClusterInfo{
Server: fmt.Sprintf("https://%s", ep),
Server: fmt.Sprintf("https://%s", ep),
CertificateAuthorityData: base64.StdEncoding.EncodeToString(cacert),
},
},

2
pkg/openshift/certgen/release39/tls.go
Просмотреть файл

@ -226,7 +226,7 @@ func (c *Config) PrepareMasterCerts() error {
NotAfter: now.AddDate(5, 0, 0),
KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment | x509.KeyUsageCertSign,
BasicConstraintsValid: true,
IsCA: true,
IsCA: true,
}
template.Subject = cacert.template.Subject

8
pkg/openshift/certgen/unstable/kubeconfig.go
Просмотреть файл

@ -106,7 +106,7 @@ func (c *Config) PrepareMasterKubeConfigs() error {
{
Name: externalEndpointName,
Cluster: ClusterInfo{
Server: fmt.Sprintf("https://%s", externalEndpoint),
Server: fmt.Sprintf("https://%s", externalEndpoint),
CertificateAuthorityData: base64.StdEncoding.EncodeToString(cacert),
},
},
@ -139,7 +139,7 @@ func (c *Config) PrepareMasterKubeConfigs() error {
{
Name: localhostEndpointName,
Cluster: ClusterInfo{
Server: fmt.Sprintf("https://%s", localhostEndpoint),
Server: fmt.Sprintf("https://%s", localhostEndpoint),
CertificateAuthorityData: base64.StdEncoding.EncodeToString(cacert),
},
},
@ -172,7 +172,7 @@ func (c *Config) PrepareMasterKubeConfigs() error {
{
Name: endpointName,
Cluster: ClusterInfo{
Server: fmt.Sprintf("https://%s", endpoint),
Server: fmt.Sprintf("https://%s", endpoint),
CertificateAuthorityData: base64.StdEncoding.EncodeToString(cacert),
},
},
@ -231,7 +231,7 @@ func (c *Config) PrepareBootstrapKubeConfig() error {
{
Name: epName,
Cluster: ClusterInfo{
Server: fmt.Sprintf("https://%s", ep),
Server: fmt.Sprintf("https://%s", ep),
CertificateAuthorityData: base64.StdEncoding.EncodeToString(cacert),
},
},

2
pkg/openshift/certgen/unstable/tls.go
Просмотреть файл

@ -226,7 +226,7 @@ func (c *Config) PrepareMasterCerts() error {
NotAfter: now.AddDate(5, 0, 0),
KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment | x509.KeyUsageCertSign,
BasicConstraintsValid: true,
IsCA: true,
IsCA: true,
}
template.Subject = cacert.template.Subject

4
pkg/operations/kubernetesupgrade/upgrader.go
Просмотреть файл

@ -503,7 +503,7 @@ func (ku *Upgrader) upgradeAgentScaleSets(ctx context.Context) error {
ku.logger.Errorf(
"Failed to delete VM %s in VMSS %s",
vmToUpgrade.Name,
vmssToUpgrade)
vmssToUpgrade.Name)
return err
}
@ -512,7 +512,7 @@ func (ku *Upgrader) upgradeAgentScaleSets(ctx context.Context) error {
vmToUpgrade.Name,
vmssToUpgrade.Name)
}
ku.logger.Infof("Completed upgrading VMSS %s", vmssToUpgrade)
ku.logger.Infof("Completed upgrading VMSS %s", vmssToUpgrade.Name)
}
ku.logger.Infoln("Completed upgrading all VMSS")

2
test/e2e/openshift/openshift_test.go
Просмотреть файл

@ -64,7 +64,7 @@ var _ = Describe("Azure Container Cluster using the OpenShift Orchestrator", fun
},
"compute": {
"node-role.kubernetes.io/compute": "true",
"region": "primary",
"region": "primary",
},
"infra": {
"region": "infra",