Switch to golang 1.11.5

For cherry-picking to 1.13

https://github.com/kubernetes/kubernetes/blob/release-1.13/build/build-image/cross/Dockerfile
This commit is contained in:
Justin SB 2019-04-20 06:24:09 -07:00
parent f41a95a10e
commit 1a575fe425
No known key found for this signature in database
GPG Key ID: 8DEC5C8217494E37
15 changed files with 39 additions and 39 deletions

View File

@ -3,10 +3,10 @@ os:
- linux - linux
- osx - osx
go: go:
# 1.8 & 1.9 are now best-effort; we recommend 1.10; k8s apimachinery relies on 1.10 # 1.10 is now best-effort; we recommend 1.11; 1.12 is in the wild but not the k8s recommended version
# - 1.8 #- "1.10" gofmt changes mean this fails testing
# - 1.9 - "1.11"
- "1.10" - "1.12"
go_import_path: k8s.io/kops go_import_path: k8s.io/kops

View File

@ -21,7 +21,7 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%)
LATEST_FILE?=latest-ci.txt LATEST_FILE?=latest-ci.txt
GOPATH_1ST:=$(shell go env | grep GOPATH | cut -f 2 -d \") GOPATH_1ST:=$(shell go env | grep GOPATH | cut -f 2 -d \")
UNIQUE:=$(shell date +%s) UNIQUE:=$(shell date +%s)
GOVERSION=1.10.8 GOVERSION=1.11.5
BUILD=$(GOPATH_1ST)/src/k8s.io/kops/.build BUILD=$(GOPATH_1ST)/src/k8s.io/kops/.build
LOCAL=$(BUILD)/local LOCAL=$(BUILD)/local
BINDATA_TARGETS=upup/models/bindata.go BINDATA_TARGETS=upup/models/bindata.go

View File

@ -21,7 +21,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_to
go_rules_dependencies() go_rules_dependencies()
go_register_toolchains( go_register_toolchains(
go_version = "1.10.8", go_version = "1.11.5",
) )
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

View File

@ -58,13 +58,13 @@ func (m *MockAutoscaling) CreateAutoScalingGroup(input *autoscaling.CreateAutoSc
DefaultCooldown: input.DefaultCooldown, DefaultCooldown: input.DefaultCooldown,
DesiredCapacity: input.DesiredCapacity, DesiredCapacity: input.DesiredCapacity,
// EnabledMetrics: input.EnabledMetrics, // EnabledMetrics: input.EnabledMetrics,
HealthCheckGracePeriod: input.HealthCheckGracePeriod, HealthCheckGracePeriod: input.HealthCheckGracePeriod,
HealthCheckType: input.HealthCheckType, HealthCheckType: input.HealthCheckType,
Instances: []*autoscaling.Instance{}, Instances: []*autoscaling.Instance{},
LaunchConfigurationName: input.LaunchConfigurationName, LaunchConfigurationName: input.LaunchConfigurationName,
LoadBalancerNames: input.LoadBalancerNames, LoadBalancerNames: input.LoadBalancerNames,
MaxSize: input.MaxSize, MaxSize: input.MaxSize,
MinSize: input.MinSize, MinSize: input.MinSize,
NewInstancesProtectedFromScaleIn: input.NewInstancesProtectedFromScaleIn, NewInstancesProtectedFromScaleIn: input.NewInstancesProtectedFromScaleIn,
PlacementGroup: input.PlacementGroup, PlacementGroup: input.PlacementGroup,
// Status: input.Status, // Status: input.Status,

View File

@ -14,7 +14,7 @@
FROM alpine:3.8 FROM alpine:3.8
ARG GO_VERSION=1.10.8 ARG GO_VERSION=1.11.5
# KOPS_GITISH: Modify to build at an explicit tag/gitish # KOPS_GITISH: Modify to build at an explicit tag/gitish
ARG KOPS_GITISH=release ARG KOPS_GITISH=release

View File

@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install golang # Install golang
RUN curl -L https://storage.googleapis.com/golang/go1.10.3.linux-amd64.tar.gz | tar zx -C /usr/local RUN curl -L https://storage.googleapis.com/golang/go1.11.5.linux-amd64.tar.gz | tar zx -C /usr/local
ENV PATH $PATH:/usr/local/go/bin ENV PATH $PATH:/usr/local/go/bin
COPY onbuild.sh /onbuild.sh COPY onbuild.sh /onbuild.sh

View File

@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install golang # Install golang
RUN curl -L https://storage.googleapis.com/golang/go1.10.3.linux-amd64.tar.gz | tar zx -C /usr/local RUN curl -L https://storage.googleapis.com/golang/go1.11.5.linux-amd64.tar.gz | tar zx -C /usr/local
ENV PATH $PATH:/usr/local/go/bin ENV PATH $PATH:/usr/local/go/bin
COPY onbuild.sh /onbuild.sh COPY onbuild.sh /onbuild.sh

View File

@ -98,7 +98,7 @@ func makeKubeconfig(ctx context.Context, config *Config, token string) ([]byte,
{ {
Name: clusterName, Name: clusterName,
Cluster: v1.Cluster{ Cluster: v1.Cluster{
Server: config.KubeAPI, Server: config.KubeAPI,
CertificateAuthorityData: content, CertificateAuthorityData: content,
}, },
}, },

View File

@ -590,7 +590,7 @@ func (b *KubeletBuilder) buildMasterKubeletKubeconfig() (*nodetasks.File, error)
template := &x509.Certificate{ template := &x509.Certificate{
BasicConstraintsValid: true, BasicConstraintsValid: true,
IsCA: false, IsCA: false,
} }
template.Subject = pkix.Name{ template.Subject = pkix.Name{

View File

@ -64,7 +64,7 @@ func Test_SharedGroups(t *testing.T) {
func makeTestInstanceGroupSec(role kops.InstanceGroupRole, secGroup *string) *kops.InstanceGroup { func makeTestInstanceGroupSec(role kops.InstanceGroupRole, secGroup *string) *kops.InstanceGroup {
return &kops.InstanceGroup{ return &kops.InstanceGroup{
Spec: kops.InstanceGroupSpec{ Spec: kops.InstanceGroupSpec{
Role: role, Role: role,
SecurityGroupOverride: secGroup, SecurityGroupOverride: secGroup,
}, },
} }

View File

@ -58,7 +58,7 @@ func TestGenerateCertificate(t *testing.T) {
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign, KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
ExtKeyUsage: []x509.ExtKeyUsage{}, ExtKeyUsage: []x509.ExtKeyUsage{},
BasicConstraintsValid: true, BasicConstraintsValid: true,
IsCA: true, IsCA: true,
} }
cert, err := SignNewCertificate(key, template, nil, nil) cert, err := SignNewCertificate(key, template, nil, nil)

View File

@ -417,16 +417,16 @@ func (c *ApplyClusterCmd) Run() error {
"iamRolePolicy": &awstasks.IAMRolePolicy{}, "iamRolePolicy": &awstasks.IAMRolePolicy{},
// VPC / Networking // VPC / Networking
"dhcpOptions": &awstasks.DHCPOptions{}, "dhcpOptions": &awstasks.DHCPOptions{},
"internetGateway": &awstasks.InternetGateway{}, "internetGateway": &awstasks.InternetGateway{},
"route": &awstasks.Route{}, "route": &awstasks.Route{},
"routeTable": &awstasks.RouteTable{}, "routeTable": &awstasks.RouteTable{},
"routeTableAssociation": &awstasks.RouteTableAssociation{}, "routeTableAssociation": &awstasks.RouteTableAssociation{},
"securityGroup": &awstasks.SecurityGroup{}, "securityGroup": &awstasks.SecurityGroup{},
"securityGroupRule": &awstasks.SecurityGroupRule{}, "securityGroupRule": &awstasks.SecurityGroupRule{},
"subnet": &awstasks.Subnet{}, "subnet": &awstasks.Subnet{},
"vpc": &awstasks.VPC{}, "vpc": &awstasks.VPC{},
"ngw": &awstasks.NatGateway{}, "ngw": &awstasks.NatGateway{},
"vpcDHDCPOptionsAssociation": &awstasks.VPCDHCPOptionsAssociation{}, "vpcDHDCPOptionsAssociation": &awstasks.VPCDHCPOptionsAssociation{},
// ELB // ELB

View File

@ -169,13 +169,13 @@ func (t *LaunchTemplate) Find(c *fi.Context) (*LaunchTemplate, error) {
glog.V(3).Infof("found existing LaunchTemplate: %s", fi.StringValue(lt.LaunchTemplateName)) glog.V(3).Infof("found existing LaunchTemplate: %s", fi.StringValue(lt.LaunchTemplateName))
actual := &LaunchTemplate{ actual := &LaunchTemplate{
AssociatePublicIP: fi.Bool(false), AssociatePublicIP: fi.Bool(false),
ID: lt.LaunchTemplateName, ID: lt.LaunchTemplateName,
ImageID: lt.LaunchTemplateData.ImageId, ImageID: lt.LaunchTemplateData.ImageId,
InstanceMonitoring: fi.Bool(false), InstanceMonitoring: fi.Bool(false),
InstanceType: lt.LaunchTemplateData.InstanceType, InstanceType: lt.LaunchTemplateData.InstanceType,
Lifecycle: t.Lifecycle, Lifecycle: t.Lifecycle,
Name: t.Name, Name: t.Name,
RootVolumeOptimization: lt.LaunchTemplateData.EbsOptimized, RootVolumeOptimization: lt.LaunchTemplateData.EbsOptimized,
} }

View File

@ -293,7 +293,7 @@ func buildCertificateTemplateForType(certificateType string) (*x509.Certificate,
template := &x509.Certificate{ template := &x509.Certificate{
BasicConstraintsValid: true, BasicConstraintsValid: true,
IsCA: false, IsCA: false,
} }
tokens := strings.Split(certificateType, ",") tokens := strings.Split(certificateType, ",")

View File

@ -144,7 +144,7 @@ func BuildCAX509Template() *x509.Certificate {
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign, KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
ExtKeyUsage: []x509.ExtKeyUsage{}, ExtKeyUsage: []x509.ExtKeyUsage{},
BasicConstraintsValid: true, BasicConstraintsValid: true,
IsCA: true, IsCA: true,
} }
return template return template
} }