Skip to content

WIP: Fix e2e #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

WIP: Fix e2e #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
261eada
Add retry logic to e2e-test.sh
Feb 14, 2019
6a68bac
*: Bump to install-config v0.12.0
wking Feb 14, 2019
9e05044
vendor: Bump installer to v0.12.0
wking Feb 14, 2019
ac56fc5
Temporary fix to not loop in route53 deletion
csrwng Feb 20, 2019
5c4f60c
Remove --cluster-name flag from generated uninstall job
csrwng Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 53 additions & 4 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ version="v1.4.7"

[[constraint]]
name = "github.com/openshift/installer"
revision = "7af6b141c34dd133f104b61b64c78d82e57f3d52"
version = "v0.12.0"

[[constraint]]
name = "github.com/openshift/generic-admission-server"
Expand Down
15 changes: 0 additions & 15 deletions config/crds/hive_v1alpha1_clusterdeployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ spec:
description: AWS is the configuration used when installing
on AWS.
properties:
iamRoleName:
description: IAMRoleName defines the IAM role associated
with the ec2 instance.
type: string
rootVolume:
description: EC2RootVolume defines the storage for ec2
instance.
Expand Down Expand Up @@ -91,7 +87,6 @@ spec:
type: array
required:
- type
- iamRoleName
- rootVolume
type: object
libvirt:
Expand Down Expand Up @@ -172,10 +167,6 @@ spec:
description: AWS is the configuration used when installing on
AWS.
properties:
iamRoleName:
description: IAMRoleName defines the IAM role associated
with the ec2 instance.
type: string
rootVolume:
description: EC2RootVolume defines the storage for ec2 instance.
properties:
Expand Down Expand Up @@ -207,7 +198,6 @@ spec:
type: array
required:
- type
- iamRoleName
- rootVolume
type: object
libvirt:
Expand Down Expand Up @@ -345,10 +335,6 @@ spec:
used when installing on AWS for machine pools which do not
define their own platform configuration.
properties:
iamRoleName:
description: IAMRoleName defines the IAM role associated
with the ec2 instance.
type: string
rootVolume:
description: EC2RootVolume defines the storage for ec2 instance.
properties:
Expand Down Expand Up @@ -380,7 +366,6 @@ spec:
type: array
required:
- type
- iamRoleName
- rootVolume
type: object
region:
Expand Down
2 changes: 0 additions & 2 deletions config/samples/hive_v1alpha1_clusterdeployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ spec:
platform:
aws:
type: m4.large
iamRoleName: ""
rootVolume:
iops: 100 # TODO
size: 22
Expand All @@ -34,7 +33,6 @@ spec:
platform:
aws:
type: m4.large
iamRoleName: ""
rootVolume:
iops: 100 # TODO
size: 22
Expand Down
2 changes: 0 additions & 2 deletions config/templates/cluster-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ objects:
platform:
aws:
type: m4.large
iamRoleName: ""
rootVolume:
iops: 100 # TODO
size: 22
Expand All @@ -130,7 +129,6 @@ objects:
platform:
aws:
type: m4.large
iamRoleName: ""
rootVolume:
iops: 100 # TODO
size: 22
Expand Down
1 change: 0 additions & 1 deletion contrib/cmd/hiveutil/awstagdeprovision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ func NewDeprovisionAWSWithTagsCommand() *cobra.Command {
flags := cmd.Flags()
flags.StringVar(&logLevel, "loglevel", "info", "log level, one of: debug, info, warn, error, fatal, panic")
flags.StringVar(&opt.Region, "region", "us-east-1", "AWS region to use")
flags.StringVar(&opt.ClusterName, "cluster-name", "", "Name that cluster was installed with")
return cmd
}

Expand Down
7 changes: 3 additions & 4 deletions contrib/pkg/installmanager/installmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,9 @@ func runUninstaller(clusterName, region, clusterID string, logger log.FieldLogge
{kubernetesKeyPrefix + clusterName: "owned"},
}
uninstaller := &aws.ClusterUninstaller{
Filters: filters,
Region: region,
ClusterName: clusterName,
Logger: logger,
Filters: filters,
Region: region,
Logger: logger,
}

return uninstaller.Run()
Expand Down
Loading