From c639d10602092d628ac924dd16d03252f3b54d7d Mon Sep 17 00:00:00 2001 From: Roman Sokolkov Date: Thu, 7 Jun 2018 13:46:23 +0200 Subject: [PATCH 1/3] Fix etcd volume attachment - Set proper dependencies (vm depends on volume and not opposite) - Set docker disk size to 50GB for master (prevent unnecessary rezizing) --- .../v12/templates/cloudformation/guest/instance.go | 13 ++++++------- .../v13/templates/cloudformation/guest/instance.go | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/service/controller/v12/templates/cloudformation/guest/instance.go b/service/controller/v12/templates/cloudformation/guest/instance.go index 825b18f720..c417c4d8a5 100644 --- a/service/controller/v12/templates/cloudformation/guest/instance.go +++ b/service/controller/v12/templates/cloudformation/guest/instance.go @@ -4,6 +4,9 @@ const Instance = `{{define "instance"}} {{ .Instance.Master.Instance.ResourceName }}: Type: "AWS::EC2::Instance" Description: Master instance + DependsOn: + - DockerVolume + - EtcdVolume Properties: AvailabilityZone: {{ .Instance.Master.AZ }} IamInstanceProfile: !Ref MasterInstanceProfile @@ -19,25 +22,21 @@ const Instance = `{{define "instance"}} Value: {{ .Instance.Cluster.ID }}-master DockerVolume: Type: AWS::EC2::Volume - DependsOn: - - {{ .Instance.Master.Instance.ResourceName }} Properties: Encrypted: true - Size: 100 + Size: 50 VolumeType: gp2 - AvailabilityZone: !GetAtt {{ .Instance.Master.Instance.ResourceName }}.AvailabilityZone + AvailabilityZone: {{ .Instance.Master.AZ }} Tags: - Key: Name Value: {{ .Instance.Master.DockerVolume.Name }} EtcdVolume: Type: AWS::EC2::Volume - DependsOn: - - {{ .Instance.Master.Instance.ResourceName }} Properties: Encrypted: true Size: 100 VolumeType: gp2 - AvailabilityZone: !GetAtt {{ .Instance.Master.Instance.ResourceName }}.AvailabilityZone + AvailabilityZone: {{ .Instance.Master.AZ }} Tags: - Key: Name Value: {{ .Instance.Master.EtcdVolume.Name }} diff --git a/service/controller/v13/templates/cloudformation/guest/instance.go b/service/controller/v13/templates/cloudformation/guest/instance.go index 825b18f720..c417c4d8a5 100644 --- a/service/controller/v13/templates/cloudformation/guest/instance.go +++ b/service/controller/v13/templates/cloudformation/guest/instance.go @@ -4,6 +4,9 @@ const Instance = `{{define "instance"}} {{ .Instance.Master.Instance.ResourceName }}: Type: "AWS::EC2::Instance" Description: Master instance + DependsOn: + - DockerVolume + - EtcdVolume Properties: AvailabilityZone: {{ .Instance.Master.AZ }} IamInstanceProfile: !Ref MasterInstanceProfile @@ -19,25 +22,21 @@ const Instance = `{{define "instance"}} Value: {{ .Instance.Cluster.ID }}-master DockerVolume: Type: AWS::EC2::Volume - DependsOn: - - {{ .Instance.Master.Instance.ResourceName }} Properties: Encrypted: true - Size: 100 + Size: 50 VolumeType: gp2 - AvailabilityZone: !GetAtt {{ .Instance.Master.Instance.ResourceName }}.AvailabilityZone + AvailabilityZone: {{ .Instance.Master.AZ }} Tags: - Key: Name Value: {{ .Instance.Master.DockerVolume.Name }} EtcdVolume: Type: AWS::EC2::Volume - DependsOn: - - {{ .Instance.Master.Instance.ResourceName }} Properties: Encrypted: true Size: 100 VolumeType: gp2 - AvailabilityZone: !GetAtt {{ .Instance.Master.Instance.ResourceName }}.AvailabilityZone + AvailabilityZone: {{ .Instance.Master.AZ }} Tags: - Key: Name Value: {{ .Instance.Master.EtcdVolume.Name }} From 81d4b754b5acaf3a0119ae53e85e3c62626e6de8 Mon Sep 17 00:00:00 2001 From: Roman Sokolkov Date: Fri, 8 Jun 2018 13:37:02 +0200 Subject: [PATCH 2/3] Add nvme udev hack --- .../v12/cloudconfig/master_template.go | 24 ++++++++++++++++- service/controller/v12/cloudconfig/spec.go | 2 +- .../v12/cloudconfig/worker_template.go | 2 +- .../cloudconfig/format_etcd_volume.go | 8 +++--- .../master_format_var_lib_docker_service.go | 2 +- .../templates/cloudconfig/nvme_udev_hack.go | 26 +++++++++++++++++++ service/controller/v12/version_bundle.go | 14 ++++++++-- .../v13/cloudconfig/master_template.go | 24 ++++++++++++++++- service/controller/v13/cloudconfig/spec.go | 2 +- .../v13/cloudconfig/worker_template.go | 2 +- .../cloudconfig/format_etcd_volume.go | 8 +++--- .../master_format_var_lib_docker_service.go | 2 +- .../templates/cloudconfig/nvme_udev_hack.go | 26 +++++++++++++++++++ service/controller/v13/version_bundle.go | 2 +- 14 files changed, 123 insertions(+), 21 deletions(-) create mode 100644 service/controller/v12/templates/cloudconfig/nvme_udev_hack.go create mode 100644 service/controller/v13/templates/cloudconfig/nvme_udev_hack.go diff --git a/service/controller/v12/cloudconfig/master_template.go b/service/controller/v12/cloudconfig/master_template.go index 237e279d0f..0bb89dc956 100644 --- a/service/controller/v12/cloudconfig/master_template.go +++ b/service/controller/v12/cloudconfig/master_template.go @@ -3,7 +3,7 @@ package cloudconfig import ( "github.com/giantswarm/apiextensions/pkg/apis/provider/v1alpha1" "github.com/giantswarm/certs/legacy" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v_3_3_2" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v_3_3_3" "github.com/giantswarm/microerror" "github.com/giantswarm/randomkeys" @@ -208,6 +208,20 @@ func (e *MasterExtension) Files() ([]k8scloudconfig.FileAsset, error) { Owner: FileOwner, Permissions: 0644, }, + // NVME disks udev rules and script. + // Workaround for https://github.com/coreos/bugs/issues/2399 + { + AssetContent: cloudconfig.NVMEUdevRule, + Path: "/etc/udev/rules.d/10-ebs-nvme-mapping.rules", + Owner: FileOwner, + Permissions: 0644, + }, + { + AssetContent: cloudconfig.NVMEUdevScript, + Path: "/opt/ebs-nvme-mapping", + Owner: FileOwner, + Permissions: 0766, + }, } var newFiles []k8scloudconfig.FileAsset @@ -231,6 +245,14 @@ func (e *MasterExtension) Files() ([]k8scloudconfig.FileAsset, error) { func (e *MasterExtension) Units() ([]k8scloudconfig.UnitAsset, error) { unitsMeta := []k8scloudconfig.UnitMetadata{ + // Create symlinks for nvme disks. + // This service should be started only on first boot. + { + AssetContent: cloudconfig.NVMEUdevTriggerUnit, + Name: "ebs-nvme-udev-trigger.service", + Enable: false, + Command: "start", + }, { AssetContent: cloudconfig.DecryptTLSAssetsService, Name: "decrypt-tls-assets.service", diff --git a/service/controller/v12/cloudconfig/spec.go b/service/controller/v12/cloudconfig/spec.go index e3f83b0d94..df52973ce9 100644 --- a/service/controller/v12/cloudconfig/spec.go +++ b/service/controller/v12/cloudconfig/spec.go @@ -7,7 +7,7 @@ import ( const ( // CloudConfigVersion defines the version of k8scloudconfig in use. // It is used in the main stack output and S3 object paths. - CloudConfigVersion = "v_3_3_2" + CloudConfigVersion = "v_3_3_3" ) type KMSClient interface { diff --git a/service/controller/v12/cloudconfig/worker_template.go b/service/controller/v12/cloudconfig/worker_template.go index e059946741..074c9ed310 100644 --- a/service/controller/v12/cloudconfig/worker_template.go +++ b/service/controller/v12/cloudconfig/worker_template.go @@ -3,7 +3,7 @@ package cloudconfig import ( "github.com/giantswarm/apiextensions/pkg/apis/provider/v1alpha1" "github.com/giantswarm/certs/legacy" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v_3_3_2" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v_3_3_3" "github.com/giantswarm/microerror" "github.com/giantswarm/aws-operator/service/controller/v12/templates/cloudconfig" diff --git a/service/controller/v12/templates/cloudconfig/format_etcd_volume.go b/service/controller/v12/templates/cloudconfig/format_etcd_volume.go index f5db2528fd..ee225efe7c 100644 --- a/service/controller/v12/templates/cloudconfig/format_etcd_volume.go +++ b/service/controller/v12/templates/cloudconfig/format_etcd_volume.go @@ -11,13 +11,11 @@ RemainAfterExit=yes # Do not wipe the disk if it's already being used, so the etcd data is # persistent across reboots and updates. -Environment=DEV=/dev/nvme2n1 +Environment=DEV=/dev/xvdh -# line 1: For compatibility with m3.large that has xvdX disks. -# line 2: Create filesystem if does not exist. -# line 3: For compatibility with older clusters. Label existing filesystem with etcd label. +# line 1: Create filesystem if does not exist. +# line 2: For compatibility with older clusters. Label existing filesystem with etcd label. ExecStart=/bin/bash -c "\ -[ -b /dev/xvdh ] && export DEV=/dev/xvdh ;\ if ! blkid $DEV; then mkfs.ext4 -L etcd $DEV; fi ;\ [ -L /dev/disk/by-label/etcd ] || e2label $DEV etcd" diff --git a/service/controller/v12/templates/cloudconfig/master_format_var_lib_docker_service.go b/service/controller/v12/templates/cloudconfig/master_format_var_lib_docker_service.go index 13e1b1eb1d..da7e11a37a 100644 --- a/service/controller/v12/templates/cloudconfig/master_format_var_lib_docker_service.go +++ b/service/controller/v12/templates/cloudconfig/master_format_var_lib_docker_service.go @@ -8,7 +8,7 @@ ConditionPathExists=!/var/lib/docker [Service] Type=oneshot -ExecStart=/bin/bash -c "([ -b "/dev/xvdc" ] && /usr/sbin/mkfs.xfs -f /dev/xvdc -L docker) || ([ -b "/dev/nvme1n1" ] && /usr/sbin/mkfs.xfs -f /dev/nvme1n1 -L docker)" +ExecStart=/bin/bash -c "[ -e "/dev/xvdc" ] && /usr/sbin/mkfs.xfs -f /dev/xvdc -L docker" [Install] WantedBy=multi-user.target diff --git a/service/controller/v12/templates/cloudconfig/nvme_udev_hack.go b/service/controller/v12/templates/cloudconfig/nvme_udev_hack.go new file mode 100644 index 0000000000..027db74fd6 --- /dev/null +++ b/service/controller/v12/templates/cloudconfig/nvme_udev_hack.go @@ -0,0 +1,26 @@ +package cloudconfig + +const NVMEUdevRule = `KERNEL=="nvme[0-9]*n[0-9]*", ENV{DEVTYPE}=="disk", ATTRS{model}=="Amazon Elastic Block Store", PROGRAM="/opt/ebs-nvme-mapping /dev/%k", SYMLINK+="%c" +` + +const NVMEUdevScript = `#!/bin/bash +vol=$(nvme id-ctrl --raw-binary "$1" | cut -c3073-3104 | tr -s ' ' | sed 's/ $//g') +vol=${vol#/dev/} +if [[ -n "$vol" ]]; then + echo ${vol/xvd/sd} ${vol/sd/xvd} +fi +` + +const NVMEUdevTriggerUnit = `[Unit] +Description=Reload AWS EBS NVMe rules +Requires=coreos-setup-environment.service +After=coreos-setup-environment.service +Before=user-config.target +[Service] +Type=oneshot +RemainAfterExit=yes +EnvironmentFile=-/etc/environment +ExecStart=/usr/bin/udevadm control --reload-rules +ExecStart=/usr/bin/udevadm trigger -y "nvme[0-9]*n[0-9]*" +ExecStart=/usr/bin/udevadm settle +` diff --git a/service/controller/v12/version_bundle.go b/service/controller/v12/version_bundle.go index 1f1683cb27..22a1f060aa 100644 --- a/service/controller/v12/version_bundle.go +++ b/service/controller/v12/version_bundle.go @@ -29,7 +29,17 @@ func VersionBundle() versionbundle.Bundle { }, { Component: "kubernetes", - Description: "Updated to 1.10.2 due to regression in 1.10.3 with configmaps.", + Description: "Updated to 1.10.4 due to regression in 1.10.3 with configmaps.", + Kind: versionbundle.KindChanged, + }, + { + Component: "cloudconfig", + Description: "Added udev rule for NVMe disks.", + Kind: versionbundle.KindAdded, + }, + { + Component: "cloudconfig", + Description: "Remove Nginx version from Server header in Ingress Controller", Kind: versionbundle.KindChanged, }, }, @@ -56,7 +66,7 @@ func VersionBundle() versionbundle.Bundle { }, { Name: "kubernetes", - Version: "1.10.2", + Version: "1.10.4", }, { Name: "nginx-ingress-controller", diff --git a/service/controller/v13/cloudconfig/master_template.go b/service/controller/v13/cloudconfig/master_template.go index a1b1afef96..94f041b8a6 100644 --- a/service/controller/v13/cloudconfig/master_template.go +++ b/service/controller/v13/cloudconfig/master_template.go @@ -3,7 +3,7 @@ package cloudconfig import ( "github.com/giantswarm/apiextensions/pkg/apis/provider/v1alpha1" "github.com/giantswarm/certs/legacy" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v_3_3_2" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v_3_3_3" "github.com/giantswarm/microerror" "github.com/giantswarm/randomkeys" @@ -208,6 +208,20 @@ func (e *MasterExtension) Files() ([]k8scloudconfig.FileAsset, error) { Owner: FileOwner, Permissions: 0644, }, + // NVME disks udev rules and script. + // Workaround for https://github.com/coreos/bugs/issues/2399 + { + AssetContent: cloudconfig.NVMEUdevRule, + Path: "/etc/udev/rules.d/10-ebs-nvme-mapping.rules", + Owner: FileOwner, + Permissions: 0644, + }, + { + AssetContent: cloudconfig.NVMEUdevScript, + Path: "/opt/ebs-nvme-mapping", + Owner: FileOwner, + Permissions: 0766, + }, } var newFiles []k8scloudconfig.FileAsset @@ -231,6 +245,14 @@ func (e *MasterExtension) Files() ([]k8scloudconfig.FileAsset, error) { func (e *MasterExtension) Units() ([]k8scloudconfig.UnitAsset, error) { unitsMeta := []k8scloudconfig.UnitMetadata{ + // Create symlinks for nvme disks. + // This service should be started only on first boot. + { + AssetContent: cloudconfig.NVMEUdevTriggerUnit, + Name: "ebs-nvme-udev-trigger.service", + Enable: false, + Command: "start", + }, { AssetContent: cloudconfig.DecryptTLSAssetsService, Name: "decrypt-tls-assets.service", diff --git a/service/controller/v13/cloudconfig/spec.go b/service/controller/v13/cloudconfig/spec.go index e3f83b0d94..df52973ce9 100644 --- a/service/controller/v13/cloudconfig/spec.go +++ b/service/controller/v13/cloudconfig/spec.go @@ -7,7 +7,7 @@ import ( const ( // CloudConfigVersion defines the version of k8scloudconfig in use. // It is used in the main stack output and S3 object paths. - CloudConfigVersion = "v_3_3_2" + CloudConfigVersion = "v_3_3_3" ) type KMSClient interface { diff --git a/service/controller/v13/cloudconfig/worker_template.go b/service/controller/v13/cloudconfig/worker_template.go index ddd20b398b..1ca2dc4a6e 100644 --- a/service/controller/v13/cloudconfig/worker_template.go +++ b/service/controller/v13/cloudconfig/worker_template.go @@ -3,7 +3,7 @@ package cloudconfig import ( "github.com/giantswarm/apiextensions/pkg/apis/provider/v1alpha1" "github.com/giantswarm/certs/legacy" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v_3_3_2" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v_3_3_3" "github.com/giantswarm/microerror" "github.com/giantswarm/aws-operator/service/controller/v13/templates/cloudconfig" diff --git a/service/controller/v13/templates/cloudconfig/format_etcd_volume.go b/service/controller/v13/templates/cloudconfig/format_etcd_volume.go index f5db2528fd..ee225efe7c 100644 --- a/service/controller/v13/templates/cloudconfig/format_etcd_volume.go +++ b/service/controller/v13/templates/cloudconfig/format_etcd_volume.go @@ -11,13 +11,11 @@ RemainAfterExit=yes # Do not wipe the disk if it's already being used, so the etcd data is # persistent across reboots and updates. -Environment=DEV=/dev/nvme2n1 +Environment=DEV=/dev/xvdh -# line 1: For compatibility with m3.large that has xvdX disks. -# line 2: Create filesystem if does not exist. -# line 3: For compatibility with older clusters. Label existing filesystem with etcd label. +# line 1: Create filesystem if does not exist. +# line 2: For compatibility with older clusters. Label existing filesystem with etcd label. ExecStart=/bin/bash -c "\ -[ -b /dev/xvdh ] && export DEV=/dev/xvdh ;\ if ! blkid $DEV; then mkfs.ext4 -L etcd $DEV; fi ;\ [ -L /dev/disk/by-label/etcd ] || e2label $DEV etcd" diff --git a/service/controller/v13/templates/cloudconfig/master_format_var_lib_docker_service.go b/service/controller/v13/templates/cloudconfig/master_format_var_lib_docker_service.go index 13e1b1eb1d..da7e11a37a 100644 --- a/service/controller/v13/templates/cloudconfig/master_format_var_lib_docker_service.go +++ b/service/controller/v13/templates/cloudconfig/master_format_var_lib_docker_service.go @@ -8,7 +8,7 @@ ConditionPathExists=!/var/lib/docker [Service] Type=oneshot -ExecStart=/bin/bash -c "([ -b "/dev/xvdc" ] && /usr/sbin/mkfs.xfs -f /dev/xvdc -L docker) || ([ -b "/dev/nvme1n1" ] && /usr/sbin/mkfs.xfs -f /dev/nvme1n1 -L docker)" +ExecStart=/bin/bash -c "[ -e "/dev/xvdc" ] && /usr/sbin/mkfs.xfs -f /dev/xvdc -L docker" [Install] WantedBy=multi-user.target diff --git a/service/controller/v13/templates/cloudconfig/nvme_udev_hack.go b/service/controller/v13/templates/cloudconfig/nvme_udev_hack.go new file mode 100644 index 0000000000..027db74fd6 --- /dev/null +++ b/service/controller/v13/templates/cloudconfig/nvme_udev_hack.go @@ -0,0 +1,26 @@ +package cloudconfig + +const NVMEUdevRule = `KERNEL=="nvme[0-9]*n[0-9]*", ENV{DEVTYPE}=="disk", ATTRS{model}=="Amazon Elastic Block Store", PROGRAM="/opt/ebs-nvme-mapping /dev/%k", SYMLINK+="%c" +` + +const NVMEUdevScript = `#!/bin/bash +vol=$(nvme id-ctrl --raw-binary "$1" | cut -c3073-3104 | tr -s ' ' | sed 's/ $//g') +vol=${vol#/dev/} +if [[ -n "$vol" ]]; then + echo ${vol/xvd/sd} ${vol/sd/xvd} +fi +` + +const NVMEUdevTriggerUnit = `[Unit] +Description=Reload AWS EBS NVMe rules +Requires=coreos-setup-environment.service +After=coreos-setup-environment.service +Before=user-config.target +[Service] +Type=oneshot +RemainAfterExit=yes +EnvironmentFile=-/etc/environment +ExecStart=/usr/bin/udevadm control --reload-rules +ExecStart=/usr/bin/udevadm trigger -y "nvme[0-9]*n[0-9]*" +ExecStart=/usr/bin/udevadm settle +` diff --git a/service/controller/v13/version_bundle.go b/service/controller/v13/version_bundle.go index a2e8119ea2..d53c9df752 100644 --- a/service/controller/v13/version_bundle.go +++ b/service/controller/v13/version_bundle.go @@ -36,7 +36,7 @@ func VersionBundle() versionbundle.Bundle { }, { Name: "kubernetes", - Version: "1.10.2", + Version: "1.10.4", }, { Name: "nginx-ingress-controller", From 2752d0e6b850aebab55084f9c328299668c94182 Mon Sep 17 00:00:00 2001 From: Roman Sokolkov Date: Fri, 8 Jun 2018 14:47:18 +0200 Subject: [PATCH 3/3] Update vendor --- Gopkg.lock | 6 +++--- .../{v_3_3_2 => v_3_3_3}/cloudconfig.go | 2 +- .../k8scloudconfig/{v_3_3_2 => v_3_3_3}/error.go | 2 +- .../{v_3_3_2 => v_3_3_3}/master_template.go | 13 +++++++------ .../{v_3_3_2 => v_3_3_3}/render_asset_content.go | 2 +- .../k8scloudconfig/{v_3_3_2 => v_3_3_3}/types.go | 2 +- .../{v_3_3_2 => v_3_3_3}/worker_template.go | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-) rename vendor/github.com/giantswarm/k8scloudconfig/{v_3_3_2 => v_3_3_3}/cloudconfig.go (98%) rename vendor/github.com/giantswarm/k8scloudconfig/{v_3_3_2 => v_3_3_3}/error.go (93%) rename vendor/github.com/giantswarm/k8scloudconfig/{v_3_3_2 => v_3_3_3}/master_template.go (99%) rename vendor/github.com/giantswarm/k8scloudconfig/{v_3_3_2 => v_3_3_3}/render_asset_content.go (96%) rename vendor/github.com/giantswarm/k8scloudconfig/{v_3_3_2 => v_3_3_3}/types.go (99%) rename vendor/github.com/giantswarm/k8scloudconfig/{v_3_3_2 => v_3_3_3}/worker_template.go (99%) diff --git a/Gopkg.lock b/Gopkg.lock index 2a6a244873..a31162a2e9 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -279,9 +279,9 @@ "v_3_2_5", "v_3_2_6", "v_3_3_1", - "v_3_3_2" + "v_3_3_3" ] - revision = "f43d2065fcb7b9ffc5947a467c9175388cfea6e1" + revision = "6540ef0fde28ce1c4f335dc7cd7df88e35fd1790" [[projects]] branch = "master" @@ -1432,6 +1432,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "2675d8ea9bd5be20841fc12de9ed5b837bdd614279b9f14dda144347858e62f1" + inputs-digest = "277c780a8c156428fe54c7ec86433ecb065233cd3ee8d2c6f67b8bc96e8d4246" solver-name = "gps-cdcl" solver-version = 1 diff --git a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/cloudconfig.go b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/cloudconfig.go similarity index 98% rename from vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/cloudconfig.go rename to vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/cloudconfig.go index 7a44981144..42af0918f7 100644 --- a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/cloudconfig.go +++ b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/cloudconfig.go @@ -1,4 +1,4 @@ -package v_3_3_2 +package v_3_3_3 import ( "bytes" diff --git a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/error.go b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/error.go similarity index 93% rename from vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/error.go rename to vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/error.go index 652405fc20..2cc0e44149 100644 --- a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/error.go +++ b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/error.go @@ -1,4 +1,4 @@ -package v_3_3_2 +package v_3_3_3 import "github.com/giantswarm/microerror" diff --git a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/master_template.go b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/master_template.go similarity index 99% rename from vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/master_template.go rename to vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/master_template.go index 4f7af3ea5a..06fdb5089d 100644 --- a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/master_template.go +++ b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/master_template.go @@ -1,4 +1,4 @@ -package v_3_3_2 +package v_3_3_3 const MasterTemplate = `#cloud-config users: @@ -597,6 +597,7 @@ write_files: data: server-name-hash-bucket-size: "1024" server-name-hash-max-size: "1024" + server-tokens: "false" - path: /srv/ingress-controller-dep.yml owner: root permissions: 0644 @@ -763,7 +764,7 @@ write_files: serviceAccountName: kube-proxy containers: - name: kube-proxy - image: quay.io/giantswarm/hyperkube:v1.10.2 + image: quay.io/giantswarm/hyperkube:v1.10.4 command: - /hyperkube - proxy @@ -1528,7 +1529,7 @@ write_files: priorityClassName: core-pods containers: - name: k8s-api-server - image: quay.io/giantswarm/hyperkube:v1.10.2 + image: quay.io/giantswarm/hyperkube:v1.10.4 env: - name: HOST_IP valueFrom: @@ -1650,7 +1651,7 @@ write_files: priorityClassName: core-pods containers: - name: k8s-controller-manager - image: quay.io/giantswarm/hyperkube:v1.10.2 + image: quay.io/giantswarm/hyperkube:v1.10.4 command: - /hyperkube - controller-manager @@ -1723,7 +1724,7 @@ write_files: priorityClassName: core-pods containers: - name: k8s-scheduler - image: quay.io/giantswarm/hyperkube:v1.10.2 + image: quay.io/giantswarm/hyperkube:v1.10.4 command: - /hyperkube - scheduler @@ -2011,7 +2012,7 @@ coreos: RestartSec=0 TimeoutStopSec=10 EnvironmentFile=/etc/network-environment - Environment="IMAGE=quay.io/giantswarm/hyperkube:v1.10.2" + Environment="IMAGE=quay.io/giantswarm/hyperkube:v1.10.4" Environment="NAME=%p.service" Environment="NETWORK_CONFIG_CONTAINER=" ExecStartPre=/usr/bin/docker pull $IMAGE diff --git a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/render_asset_content.go b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/render_asset_content.go similarity index 96% rename from vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/render_asset_content.go rename to vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/render_asset_content.go index d5ce0de675..16e0451517 100644 --- a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/render_asset_content.go +++ b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/render_asset_content.go @@ -1,4 +1,4 @@ -package v_3_3_2 +package v_3_3_3 import ( "bytes" diff --git a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/types.go b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/types.go similarity index 99% rename from vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/types.go rename to vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/types.go index 7d951cc138..72d3f28af9 100644 --- a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/types.go +++ b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/types.go @@ -1,4 +1,4 @@ -package v_3_3_2 +package v_3_3_3 import ( "github.com/giantswarm/apiextensions/pkg/apis/provider/v1alpha1" diff --git a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/worker_template.go b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/worker_template.go similarity index 99% rename from vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/worker_template.go rename to vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/worker_template.go index 3ffc04cead..6804a09077 100644 --- a/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_2/worker_template.go +++ b/vendor/github.com/giantswarm/k8scloudconfig/v_3_3_3/worker_template.go @@ -1,4 +1,4 @@ -package v_3_3_2 +package v_3_3_3 const WorkerTemplate = `#cloud-config users: @@ -248,7 +248,7 @@ coreos: RestartSec=0 TimeoutStopSec=10 EnvironmentFile=/etc/network-environment - Environment="IMAGE=quay.io/giantswarm/hyperkube:v1.10.2" + Environment="IMAGE=quay.io/giantswarm/hyperkube:v1.10.4" Environment="NAME=%p.service" Environment="NETWORK_CONFIG_CONTAINER=" ExecStartPre=/usr/bin/docker pull $IMAGE