Skip to content

pkg/tfvars: Drop AWS.Profile #466

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

Merged
openshift-merge-robot merged 1 commit into from
Oct 15, 2018
Merged

pkg/tfvars: Drop AWS.Profile #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion data/data/aws/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ locals {

provider "aws" {
region = "${var.tectonic_aws_region}"
profile = "${var.tectonic_aws_profile}"
version = "1.8.0"

assume_role {
Expand Down
8 changes: 0 additions & 8 deletions data/data/aws/variables-aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ EOF
default = "1.0"
}

variable "tectonic_aws_profile" {
description = <<EOF
(optional) This declares the AWS credentials profile to use.
EOF

type = "string"
}

variable "tectonic_aws_master_ec2_type" {
type = "string"
description = "Instance size for the master node(s). Example: `t2.medium`."
Expand Down
3 changes: 0 additions & 3 deletions pkg/tfvars/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ const (
EndpointsPublic Endpoints = "public"
// DefaultVPCCIDRBlock is the default CIDR range for an AWS VPC.
DefaultVPCCIDRBlock = "10.0.0.0/16"
// DefaultProfile is the default AWS credentials profile to use.
DefaultProfile = "default"
// DefaultRegion is the default AWS region for the cluster.
DefaultRegion = "us-east-1"
)
Expand All @@ -26,7 +24,6 @@ type AWS struct {
ExtraTags map[string]string `json:"tectonic_aws_extra_tags,omitempty" yaml:"extraTags,omitempty"`
InstallerRole string `json:"tectonic_aws_installer_role,omitempty" yaml:"installerRole,omitempty"`
Master `json:",inline" yaml:"master,omitempty"`
Profile string `json:"tectonic_aws_profile,omitempty" yaml:"profile,omitempty"`
Region string `json:"tectonic_aws_region,omitempty" yaml:"region,omitempty"`
VPCCIDRBlock string `json:"tectonic_aws_vpc_cidr_block,omitempty" yaml:"vpcCIDRBlock,omitempty"`
Worker `json:",inline" yaml:"worker,omitempty"`
Expand Down
3 changes: 1 addition & 2 deletions pkg/tfvars/tfvars.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ func TFVars(cfg *types.InstallConfig, bootstrapIgn string, masterIgns []string,
}

config.AWS = aws.AWS{
Endpoints: aws.EndpointsAll, // Default value for endpoints.
Profile: aws.DefaultProfile, // Default value for profile.
Endpoints: aws.EndpointsAll, // Default value for endpoints.
Region: cfg.Platform.AWS.Region,
ExtraTags: cfg.Platform.AWS.UserTags,
External: aws.External{
Expand Down