diff --git a/.travis.yml b/.travis.yml index 17cea8c581..b2febf02ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/Makefile b/Makefile index a814574bfd..e01c69975c 100644 --- a/Makefile +++ b/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 diff --git a/WORKSPACE b/WORKSPACE index b0d8add7cf..56e19a9e57 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -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") diff --git a/cloudmock/aws/mockautoscaling/group.go b/cloudmock/aws/mockautoscaling/group.go index a013ff43fe..3360291348 100644 --- a/cloudmock/aws/mockautoscaling/group.go +++ b/cloudmock/aws/mockautoscaling/group.go @@ -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, diff --git a/docker/Dockerfile b/docker/Dockerfile index 6d9d0b79b0..561586c1ae 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 diff --git a/images/dns-controller-builder/Dockerfile b/images/dns-controller-builder/Dockerfile index 28bae46db1..5141c2e967 100644 --- a/images/dns-controller-builder/Dockerfile +++ b/images/dns-controller-builder/Dockerfile @@ -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 diff --git a/images/protokube-builder/Dockerfile b/images/protokube-builder/Dockerfile index 28bae46db1..5141c2e967 100644 --- a/images/protokube-builder/Dockerfile +++ b/images/protokube-builder/Dockerfile @@ -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 diff --git a/node-authorizer/pkg/client/helper.go b/node-authorizer/pkg/client/helper.go index 1c6ff87e0f..55b4262758 100644 --- a/node-authorizer/pkg/client/helper.go +++ b/node-authorizer/pkg/client/helper.go @@ -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, }, }, diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go index 96257ded1b..7ab0231685 100644 --- a/nodeup/pkg/model/kubelet.go +++ b/nodeup/pkg/model/kubelet.go @@ -590,7 +590,7 @@ func (b *KubeletBuilder) buildMasterKubeletKubeconfig() (*nodetasks.File, error) template := &x509.Certificate{ BasicConstraintsValid: true, - IsCA: false, + IsCA: false, } template.Subject = pkix.Name{ diff --git a/pkg/model/firewall_test.go b/pkg/model/firewall_test.go index 7dcb74ab3f..93244a0779 100644 --- a/pkg/model/firewall_test.go +++ b/pkg/model/firewall_test.go @@ -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, }, } diff --git a/pkg/pki/certificate_test.go b/pkg/pki/certificate_test.go index 18a795dcb6..5e08e3dd57 100644 --- a/pkg/pki/certificate_test.go +++ b/pkg/pki/certificate_test.go @@ -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) diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index b85d657581..9859da4fbe 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -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 diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go index 2513777d48..0fb03ba801 100644 --- a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go +++ b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go @@ -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, } diff --git a/upup/pkg/fi/fitasks/keypair.go b/upup/pkg/fi/fitasks/keypair.go index b6c1b47b9e..0bba132b85 100644 --- a/upup/pkg/fi/fitasks/keypair.go +++ b/upup/pkg/fi/fitasks/keypair.go @@ -293,7 +293,7 @@ func buildCertificateTemplateForType(certificateType string) (*x509.Certificate, template := &x509.Certificate{ BasicConstraintsValid: true, - IsCA: false, + IsCA: false, } tokens := strings.Split(certificateType, ",") diff --git a/upup/pkg/fi/vfs_castore.go b/upup/pkg/fi/vfs_castore.go index e73a1f423b..f519baf619 100644 --- a/upup/pkg/fi/vfs_castore.go +++ b/upup/pkg/fi/vfs_castore.go @@ -144,7 +144,7 @@ func BuildCAX509Template() *x509.Certificate { KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign, ExtKeyUsage: []x509.ExtKeyUsage{}, BasicConstraintsValid: true, - IsCA: true, + IsCA: true, } return template }