Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c8b69244
Commit
c8b69244
authored
Jul 20, 2017
by
Luke Heidecke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix on-premises term in error string and comments
parent
e48ad778
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
aws.go
pkg/cloudprovider/providers/aws/aws.go
+3
-3
No files found.
pkg/cloudprovider/providers/aws/aws.go
View file @
c8b69244
...
@@ -403,7 +403,7 @@ type CloudConfig struct {
...
@@ -403,7 +403,7 @@ type CloudConfig struct {
Zone
string
Zone
string
// The AWS VPC flag enables the possibility to run the master components
// The AWS VPC flag enables the possibility to run the master components
// on a different aws account, on a different cloud provider or on-premise.
// on a different aws account, on a different cloud provider or on-premise
s
.
// If the flag is set also the KubernetesClusterTag must be provided
// If the flag is set also the KubernetesClusterTag must be provided
VPC
string
VPC
string
// SubnetID enables using a specific subnet to use for ELB's
// SubnetID enables using a specific subnet to use for ELB's
...
@@ -876,9 +876,9 @@ func newAWSCloud(config io.Reader, awsServices Services) (*Cloud, error) {
...
@@ -876,9 +876,9 @@ func newAWSCloud(config io.Reader, awsServices Services) (*Cloud, error) {
awsCloud
.
instanceCache
.
cloud
=
awsCloud
awsCloud
.
instanceCache
.
cloud
=
awsCloud
if
cfg
.
Global
.
VPC
!=
""
&&
cfg
.
Global
.
SubnetID
!=
""
&&
(
cfg
.
Global
.
KubernetesClusterTag
!=
""
||
cfg
.
Global
.
KubernetesClusterID
!=
""
)
{
if
cfg
.
Global
.
VPC
!=
""
&&
cfg
.
Global
.
SubnetID
!=
""
&&
(
cfg
.
Global
.
KubernetesClusterTag
!=
""
||
cfg
.
Global
.
KubernetesClusterID
!=
""
)
{
// When the master is running on a different AWS account, cloud provider or on-premise
// When the master is running on a different AWS account, cloud provider or on-premise
s
// build up a dummy instance and use the VPC from the nodes account
// build up a dummy instance and use the VPC from the nodes account
glog
.
Info
(
"Master is configured to run on a different AWS account, different cloud provider or on-premise"
)
glog
.
Info
(
"Master is configured to run on a different AWS account, different cloud provider or on-premise
s
"
)
awsCloud
.
selfAWSInstance
=
&
awsInstance
{
awsCloud
.
selfAWSInstance
=
&
awsInstance
{
nodeName
:
"master-dummy"
,
nodeName
:
"master-dummy"
,
vpcID
:
cfg
.
Global
.
VPC
,
vpcID
:
cfg
.
Global
.
VPC
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment