From 976724dfecf11174ca7b6d0f6e9c1a5895bfea61 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Tue, 24 Dec 2019 11:53:21 -0500 Subject: [PATCH] Update tests for leaner configuration --- .../additional_cidr/cloudformation.json.extracted.yaml | 7 ------- .../cloudformation.json.extracted.yaml | 7 ------- .../complex/cloudformation.json.extracted.yaml | 7 ------- .../cloudformation.json.extracted.yaml | 7 ------- .../cloudformation.json.extracted.yaml | 7 ------- .../externallb/cloudformation.json.extracted.yaml | 7 ------- .../cloudformation.json.extracted.yaml | 7 ------- .../mixed_instances/cloudformation.json.extracted.yaml | 7 ------- .../cloudformation.json.extracted.yaml | 7 ------- .../privatecalico/cloudformation.json.extracted.yaml | 7 ------- 10 files changed, 70 deletions(-) diff --git a/tests/integration/update_cluster/additional_cidr/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/additional_cidr/cloudformation.json.extracted.yaml index 47b2944755..da7bb0ee06 100644 --- a/tests/integration/update_cluster/additional_cidr/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/additional_cidr/cloudformation.json.extracted.yaml @@ -485,13 +485,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionalcidrexamplecom.Propert - _aws channels: - memfs://clusters.example.com/additionalcidr.example.com/addons/bootstrap-channel.yaml - protokubeImage: - hash: 42a9c4324fe26d63ce11f3dd7836371bc93fa06ca8f479807728f3746e27061b - name: protokube:1.15.0 - sources: - - https://artifacts.k8s.io/binaries/kops/1.15.0/images/protokube.tar.gz - - https://github.com/kubernetes/kops/releases/download/1.15.0/images-protokube.tar.gz - - https://kubeupv2.s3.amazonaws.com/kops/1.15.0/images/protokube.tar.gz __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml index 19e073b364..f49748f714 100644 --- a/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml @@ -514,13 +514,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionaluserdataexamplecom.Pro - _aws channels: - memfs://clusters.example.com/additionaluserdata.example.com/addons/bootstrap-channel.yaml - protokubeImage: - hash: 42a9c4324fe26d63ce11f3dd7836371bc93fa06ca8f479807728f3746e27061b - name: protokube:1.15.0 - sources: - - https://artifacts.k8s.io/binaries/kops/1.15.0/images/protokube.tar.gz - - https://github.com/kubernetes/kops/releases/download/1.15.0/images-protokube.tar.gz - - https://kubeupv2.s3.amazonaws.com/kops/1.15.0/images/protokube.tar.gz __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index 59a28ed99d..f91da52c03 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml @@ -487,13 +487,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodescomplexexamplecom.Properties.Use - _aws channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml - protokubeImage: - hash: 42a9c4324fe26d63ce11f3dd7836371bc93fa06ca8f479807728f3746e27061b - name: protokube:1.15.0 - sources: - - https://artifacts.k8s.io/binaries/kops/1.15.0/images/protokube.tar.gz - - https://github.com/kubernetes/kops/releases/download/1.15.0/images-protokube.tar.gz - - https://kubeupv2.s3.amazonaws.com/kops/1.15.0/images/protokube.tar.gz __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json.extracted.yaml index 28995939cc..d9eff7defa 100644 --- a/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json.extracted.yaml @@ -473,13 +473,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodescontainerdexamplecom.Properties. - _aws channels: - memfs://clusters.example.com/containerd.example.com/addons/bootstrap-channel.yaml - protokubeImage: - hash: 42a9c4324fe26d63ce11f3dd7836371bc93fa06ca8f479807728f3746e27061b - name: protokube:1.15.0 - sources: - - https://artifacts.k8s.io/binaries/kops/1.15.0/images/protokube.tar.gz - - https://github.com/kubernetes/kops/releases/download/1.15.0/images-protokube.tar.gz - - https://kubeupv2.s3.amazonaws.com/kops/1.15.0/images/protokube.tar.gz __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml index b2ff5e0bbb..0791afe830 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml @@ -485,13 +485,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use - _aws channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml - protokubeImage: - hash: 42a9c4324fe26d63ce11f3dd7836371bc93fa06ca8f479807728f3746e27061b - name: protokube:1.15.0 - sources: - - https://artifacts.k8s.io/binaries/kops/1.15.0/images/protokube.tar.gz - - https://github.com/kubernetes/kops/releases/download/1.15.0/images-protokube.tar.gz - - https://kubeupv2.s3.amazonaws.com/kops/1.15.0/images/protokube.tar.gz __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index 637a1cd7d9..3a9e7a197a 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -485,13 +485,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodesexternallbexamplecom.Properties. - _aws channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml - protokubeImage: - hash: 42a9c4324fe26d63ce11f3dd7836371bc93fa06ca8f479807728f3746e27061b - name: protokube:1.15.0 - sources: - - https://artifacts.k8s.io/binaries/kops/1.15.0/images/protokube.tar.gz - - https://github.com/kubernetes/kops/releases/download/1.15.0/images-protokube.tar.gz - - https://kubeupv2.s3.amazonaws.com/kops/1.15.0/images/protokube.tar.gz __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml index b2ff5e0bbb..0791afe830 100644 --- a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml @@ -485,13 +485,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use - _aws channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml - protokubeImage: - hash: 42a9c4324fe26d63ce11f3dd7836371bc93fa06ca8f479807728f3746e27061b - name: protokube:1.15.0 - sources: - - https://artifacts.k8s.io/binaries/kops/1.15.0/images/protokube.tar.gz - - https://github.com/kubernetes/kops/releases/download/1.15.0/images-protokube.tar.gz - - https://kubeupv2.s3.amazonaws.com/kops/1.15.0/images/protokube.tar.gz __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml index 699987d9c0..7333b0e380 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -1076,13 +1076,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem - _aws channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml - protokubeImage: - hash: 42a9c4324fe26d63ce11f3dd7836371bc93fa06ca8f479807728f3746e27061b - name: protokube:1.15.0 - sources: - - https://artifacts.k8s.io/binaries/kops/1.15.0/images/protokube.tar.gz - - https://github.com/kubernetes/kops/releases/download/1.15.0/images-protokube.tar.gz - - https://kubeupv2.s3.amazonaws.com/kops/1.15.0/images/protokube.tar.gz __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml index 699987d9c0..7333b0e380 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml @@ -1076,13 +1076,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem - _aws channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml - protokubeImage: - hash: 42a9c4324fe26d63ce11f3dd7836371bc93fa06ca8f479807728f3746e27061b - name: protokube:1.15.0 - sources: - - https://artifacts.k8s.io/binaries/kops/1.15.0/images/protokube.tar.gz - - https://github.com/kubernetes/kops/releases/download/1.15.0/images-protokube.tar.gz - - https://kubeupv2.s3.amazonaws.com/kops/1.15.0/images/protokube.tar.gz __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index 7b65b2422e..b6c3fd7eaf 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml @@ -482,13 +482,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodesprivatecalicoexamplecom.Properti - _aws channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml - protokubeImage: - hash: 42a9c4324fe26d63ce11f3dd7836371bc93fa06ca8f479807728f3746e27061b - name: protokube:1.15.0 - sources: - - https://artifacts.k8s.io/binaries/kops/1.15.0/images/protokube.tar.gz - - https://github.com/kubernetes/kops/releases/download/1.15.0/images-protokube.tar.gz - - https://kubeupv2.s3.amazonaws.com/kops/1.15.0/images/protokube.tar.gz __EOF_KUBE_ENV