mirror of https://github.com/kubernetes/kops.git
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
parent
f41a95a10e
commit
1a575fe425
|
|
@ -3,10 +3,10 @@ os:
|
|||
- linux
|
||||
- osx
|
||||
go:
|
||||
# 1.8 & 1.9 are now best-effort; we recommend 1.10; k8s apimachinery relies on 1.10
|
||||
# - 1.8
|
||||
# - 1.9
|
||||
- "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.10" gofmt changes mean this fails testing
|
||||
- "1.11"
|
||||
- "1.12"
|
||||
|
||||
go_import_path: k8s.io/kops
|
||||
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -21,7 +21,7 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%)
|
|||
LATEST_FILE?=latest-ci.txt
|
||||
GOPATH_1ST:=$(shell go env | grep GOPATH | cut -f 2 -d \")
|
||||
UNIQUE:=$(shell date +%s)
|
||||
GOVERSION=1.10.8
|
||||
GOVERSION=1.11.5
|
||||
BUILD=$(GOPATH_1ST)/src/k8s.io/kops/.build
|
||||
LOCAL=$(BUILD)/local
|
||||
BINDATA_TARGETS=upup/models/bindata.go
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_to
|
|||
go_rules_dependencies()
|
||||
|
||||
go_register_toolchains(
|
||||
go_version = "1.10.8",
|
||||
go_version = "1.11.5",
|
||||
)
|
||||
|
||||
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
|
||||
|
|
|
|||
|
|
@ -58,13 +58,13 @@ func (m *MockAutoscaling) CreateAutoScalingGroup(input *autoscaling.CreateAutoSc
|
|||
DefaultCooldown: input.DefaultCooldown,
|
||||
DesiredCapacity: input.DesiredCapacity,
|
||||
// EnabledMetrics: input.EnabledMetrics,
|
||||
HealthCheckGracePeriod: input.HealthCheckGracePeriod,
|
||||
HealthCheckType: input.HealthCheckType,
|
||||
Instances: []*autoscaling.Instance{},
|
||||
LaunchConfigurationName: input.LaunchConfigurationName,
|
||||
LoadBalancerNames: input.LoadBalancerNames,
|
||||
MaxSize: input.MaxSize,
|
||||
MinSize: input.MinSize,
|
||||
HealthCheckGracePeriod: input.HealthCheckGracePeriod,
|
||||
HealthCheckType: input.HealthCheckType,
|
||||
Instances: []*autoscaling.Instance{},
|
||||
LaunchConfigurationName: input.LaunchConfigurationName,
|
||||
LoadBalancerNames: input.LoadBalancerNames,
|
||||
MaxSize: input.MaxSize,
|
||||
MinSize: input.MinSize,
|
||||
NewInstancesProtectedFromScaleIn: input.NewInstancesProtectedFromScaleIn,
|
||||
PlacementGroup: input.PlacementGroup,
|
||||
// Status: input.Status,
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
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
|
||||
ARG KOPS_GITISH=release
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \
|
|||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# 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
|
||||
|
||||
COPY onbuild.sh /onbuild.sh
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \
|
|||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# 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
|
||||
|
||||
COPY onbuild.sh /onbuild.sh
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ func makeKubeconfig(ctx context.Context, config *Config, token string) ([]byte,
|
|||
{
|
||||
Name: clusterName,
|
||||
Cluster: v1.Cluster{
|
||||
Server: config.KubeAPI,
|
||||
Server: config.KubeAPI,
|
||||
CertificateAuthorityData: content,
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -590,7 +590,7 @@ func (b *KubeletBuilder) buildMasterKubeletKubeconfig() (*nodetasks.File, error)
|
|||
|
||||
template := &x509.Certificate{
|
||||
BasicConstraintsValid: true,
|
||||
IsCA: false,
|
||||
IsCA: false,
|
||||
}
|
||||
|
||||
template.Subject = pkix.Name{
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ func Test_SharedGroups(t *testing.T) {
|
|||
func makeTestInstanceGroupSec(role kops.InstanceGroupRole, secGroup *string) *kops.InstanceGroup {
|
||||
return &kops.InstanceGroup{
|
||||
Spec: kops.InstanceGroupSpec{
|
||||
Role: role,
|
||||
Role: role,
|
||||
SecurityGroupOverride: secGroup,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ func TestGenerateCertificate(t *testing.T) {
|
|||
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
|
||||
ExtKeyUsage: []x509.ExtKeyUsage{},
|
||||
BasicConstraintsValid: true,
|
||||
IsCA: true,
|
||||
IsCA: true,
|
||||
}
|
||||
|
||||
cert, err := SignNewCertificate(key, template, nil, nil)
|
||||
|
|
|
|||
|
|
@ -417,16 +417,16 @@ func (c *ApplyClusterCmd) Run() error {
|
|||
"iamRolePolicy": &awstasks.IAMRolePolicy{},
|
||||
|
||||
// VPC / Networking
|
||||
"dhcpOptions": &awstasks.DHCPOptions{},
|
||||
"internetGateway": &awstasks.InternetGateway{},
|
||||
"route": &awstasks.Route{},
|
||||
"routeTable": &awstasks.RouteTable{},
|
||||
"routeTableAssociation": &awstasks.RouteTableAssociation{},
|
||||
"securityGroup": &awstasks.SecurityGroup{},
|
||||
"securityGroupRule": &awstasks.SecurityGroupRule{},
|
||||
"subnet": &awstasks.Subnet{},
|
||||
"vpc": &awstasks.VPC{},
|
||||
"ngw": &awstasks.NatGateway{},
|
||||
"dhcpOptions": &awstasks.DHCPOptions{},
|
||||
"internetGateway": &awstasks.InternetGateway{},
|
||||
"route": &awstasks.Route{},
|
||||
"routeTable": &awstasks.RouteTable{},
|
||||
"routeTableAssociation": &awstasks.RouteTableAssociation{},
|
||||
"securityGroup": &awstasks.SecurityGroup{},
|
||||
"securityGroupRule": &awstasks.SecurityGroupRule{},
|
||||
"subnet": &awstasks.Subnet{},
|
||||
"vpc": &awstasks.VPC{},
|
||||
"ngw": &awstasks.NatGateway{},
|
||||
"vpcDHDCPOptionsAssociation": &awstasks.VPCDHCPOptionsAssociation{},
|
||||
|
||||
// ELB
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
||||
actual := &LaunchTemplate{
|
||||
AssociatePublicIP: fi.Bool(false),
|
||||
ID: lt.LaunchTemplateName,
|
||||
ImageID: lt.LaunchTemplateData.ImageId,
|
||||
InstanceMonitoring: fi.Bool(false),
|
||||
InstanceType: lt.LaunchTemplateData.InstanceType,
|
||||
Lifecycle: t.Lifecycle,
|
||||
Name: t.Name,
|
||||
AssociatePublicIP: fi.Bool(false),
|
||||
ID: lt.LaunchTemplateName,
|
||||
ImageID: lt.LaunchTemplateData.ImageId,
|
||||
InstanceMonitoring: fi.Bool(false),
|
||||
InstanceType: lt.LaunchTemplateData.InstanceType,
|
||||
Lifecycle: t.Lifecycle,
|
||||
Name: t.Name,
|
||||
RootVolumeOptimization: lt.LaunchTemplateData.EbsOptimized,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -293,7 +293,7 @@ func buildCertificateTemplateForType(certificateType string) (*x509.Certificate,
|
|||
|
||||
template := &x509.Certificate{
|
||||
BasicConstraintsValid: true,
|
||||
IsCA: false,
|
||||
IsCA: false,
|
||||
}
|
||||
|
||||
tokens := strings.Split(certificateType, ",")
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ func BuildCAX509Template() *x509.Certificate {
|
|||
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
|
||||
ExtKeyUsage: []x509.ExtKeyUsage{},
|
||||
BasicConstraintsValid: true,
|
||||
IsCA: true,
|
||||
IsCA: true,
|
||||
}
|
||||
return template
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue