Skip to content

Commit eb16afb

Browse files
prydieowainlewis
prydie
authored and
owainlewis
committed
Move auth.compartment to compartment in config (#172)
Depreciates "auth.compartment" in favour of "compartment" but maintains backwards compatibility (for now).
1 parent 9908ebf commit eb16afb

9 files changed

+98
-79
lines changed

‎manifests/cloud-provider-example.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
auth:
22
region: us-phoenix-1
33
tenancy: ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq
4-
compartment: ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq
54
user: ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q
65
key: |
76
-----BEGIN RSA PRIVATE KEY-----
@@ -11,6 +10,9 @@ auth:
1110
key_passphrase: supersecretpassword
1211
fingerprint: 8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74
1312

13+
# compartment configures Compartment within which the cluster resides.
14+
compartment: ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq
15+
1416
# vcn configures the Virtual Cloud Network (VCN) within which the cluster resides.
1517
vcn: ocid1.vcn.oc1..aaaaaaaask7mpk4mij3pnm6yvnntte25ffadxiivpokxevfxgtsu6ftkqhrq
1618

‎pkg/oci/ccm.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ var _ cloudprovider.Interface = &CloudProvider{}
6868
// NewCloudProvider creates a new oci.CloudProvider.
6969
func NewCloudProvider(config *Config) (cloudprovider.Interface, error) {
7070
c, err := client.New(common.NewRawConfigurationProvider(
71-
config.Auth.TenancyOCID,
72-
config.Auth.UserOCID,
71+
config.Auth.TenancyID,
72+
config.Auth.UserID,
7373
config.Auth.Region,
7474
config.Auth.Fingerprint,
7575
config.Auth.PrivateKey,
@@ -79,13 +79,13 @@ func NewCloudProvider(config *Config) (cloudprovider.Interface, error) {
7979
return nil, err
8080
}
8181

82-
if config.Auth.CompartmentOCID == "" {
82+
if config.CompartmentID == "" {
8383
glog.Info("Compartment not supplied in config: attempting to infer from instance metadata")
8484
metadata, err := instancemeta.New().Get()
8585
if err != nil {
8686
return nil, err
8787
}
88-
config.Auth.CompartmentOCID = metadata.CompartmentOCID
88+
config.CompartmentID = metadata.CompartmentOCID
8989
}
9090

9191
if config.VCNID == "" {
@@ -109,6 +109,8 @@ func init() {
109109
if err != nil {
110110
return nil, err
111111
}
112+
cfg.Complete()
113+
112114
if err = cfg.Validate(); err != nil {
113115
return nil, err
114116
}

‎pkg/oci/config.go

+23-9
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,23 @@
1515
package oci
1616

1717
import (
18-
"errors"
1918
"io"
2019
"io/ioutil"
2120

21+
"github.com/golang/glog"
22+
"github.com/pkg/errors"
2223
"gopkg.in/yaml.v2"
2324
)
2425

2526
// AuthConfig holds the configuration required for communicating with the OCI
2627
// API.
2728
type AuthConfig struct {
28-
Region string `yaml:"region"`
29-
TenancyOCID string `yaml:"tenancy"`
30-
CompartmentOCID string `yaml:"compartment"`
31-
UserOCID string `yaml:"user"`
29+
Region string `yaml:"region"`
30+
TenancyID string `yaml:"tenancy"`
31+
// CompartmentID is DEPRECIATED and should be set on the top level Config
32+
// struct.
33+
CompartmentID string `yaml:"compartment"`
34+
UserID string `yaml:"user"`
3235
PrivateKey string `yaml:"key"`
3336
Fingerprint string `yaml:"fingerprint"`
3437
PrivateKeyPassphrase string `yaml:"key_passphrase"` // TODO(apryde): the yaml should be keyPassphrase
@@ -55,11 +58,22 @@ type Config struct {
5558
Auth AuthConfig `yaml:"auth"`
5659
LoadBalancer LoadBalancerConfig `yaml:"loadBalancer"`
5760

61+
// CompartmentID is the OCID of the Compartment within which the cluster
62+
// resides.
63+
CompartmentID string `yaml:"compartment"`
5864
// VCNID is the OCID of the Virtual Cloud Network (VCN) within which the
5965
// cluster resides.
6066
VCNID string `yaml:"vcn"`
6167
}
6268

69+
// Complete the config applying defaults / overrides.
70+
func (c *Config) Complete() {
71+
if c.CompartmentID == "" && c.Auth.CompartmentID != "" {
72+
glog.Warning("cloud-provider config: \"auth.compartment\" is DEPRECIATED and will be removed in a later release. Please set \"compartment\".")
73+
c.CompartmentID = c.Auth.CompartmentID
74+
}
75+
}
76+
6377
// Validate validates the OCI cloud-provider config.
6478
func (c *Config) Validate() error {
6579
return ValidateConfig(c).ToAggregate()
@@ -71,15 +85,15 @@ func ReadConfig(r io.Reader) (*Config, error) {
7185
return nil, errors.New("no cloud-provider config file given")
7286
}
7387

74-
cfg := &Config{}
75-
7688
b, err := ioutil.ReadAll(r)
7789
if err != nil {
78-
return nil, err
90+
return nil, errors.Wrap(err, "reading cloud-provider config")
7991
}
92+
93+
cfg := &Config{}
8094
err = yaml.Unmarshal(b, &cfg)
8195
if err != nil {
82-
return nil, err
96+
return nil, errors.Wrap(err, "unmarshalling cloud-provider config")
8397
}
8498

8599
return cfg, nil

‎pkg/oci/config_test.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ const validConfig = `
3030
auth:
3131
region: us-phoenix-1
3232
tenancy: ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq
33-
compartment: ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq
3433
user: ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q
3534
key: |
3635
-----BEGIN RSA PRIVATE KEY-----
@@ -62,6 +61,8 @@ auth:
6261
-----END RSA PRIVATE KEY-----
6362
fingerprint: 97:84:f7:26:a3:7b:74:d0:bd:4e:08:a7:79:c9:d0:1d
6463
64+
compartment: ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq
65+
6566
loadBalancer:
6667
disableSecurityListManagement: false
6768
subnet1: ocid1.subnet.oc1.phx.aaaaaaaasa53hlkzk6nzksqfccegk2qnkxmphkblst3riclzs4rhwg7rg57q
@@ -132,8 +133,8 @@ func TestReadConfigShouldSetCompartmentOCIDWhenProvidedValidConfig(t *testing.T)
132133
}
133134
expected := "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq"
134135

135-
if cfg.Auth.CompartmentOCID != expected {
136-
t.Errorf("Got Auth.CompartmentOCID = %s; want Auth.CompartmentOCID = %s",
137-
cfg.Auth.CompartmentOCID, expected)
136+
if cfg.CompartmentID != expected {
137+
t.Errorf("Got CompartmentID = %s; want CompartmentID = %s",
138+
cfg.CompartmentID, expected)
138139
}
139140
}

‎pkg/oci/config_validate.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ func validateAuthConfig(c *AuthConfig, fldPath *field.Path) field.ErrorList {
2727
if c.Region == "" {
2828
allErrs = append(allErrs, field.Required(fldPath.Child("region"), ""))
2929
}
30-
if c.TenancyOCID == "" {
30+
if c.TenancyID == "" {
3131
allErrs = append(allErrs, field.Required(fldPath.Child("tenancy"), ""))
3232
}
33-
if c.UserOCID == "" {
33+
if c.UserID == "" {
3434
allErrs = append(allErrs, field.Required(fldPath.Child("user"), ""))
3535
}
3636
if c.PrivateKey == "" {

‎pkg/oci/config_validate_test.go

+45-45
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ func TestValidateConfig(t *testing.T) {
3131
name: "valid",
3232
in: &Config{
3333
Auth: AuthConfig{
34-
Region: "us-phoenix-1",
35-
TenancyOCID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
36-
CompartmentOCID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
37-
UserOCID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
38-
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
39-
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
34+
Region: "us-phoenix-1",
35+
TenancyID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
36+
CompartmentID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
37+
UserID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
38+
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
39+
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
4040
},
4141
LoadBalancer: LoadBalancerConfig{
4242
Subnet1: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
@@ -48,11 +48,11 @@ func TestValidateConfig(t *testing.T) {
4848
name: "missing_region",
4949
in: &Config{
5050
Auth: AuthConfig{
51-
TenancyOCID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
52-
CompartmentOCID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
53-
UserOCID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
54-
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
55-
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
51+
TenancyID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
52+
CompartmentID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
53+
UserID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
54+
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
55+
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
5656
},
5757
LoadBalancer: LoadBalancerConfig{
5858
Subnet1: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
@@ -66,11 +66,11 @@ func TestValidateConfig(t *testing.T) {
6666
name: "missing_tenancy",
6767
in: &Config{
6868
Auth: AuthConfig{
69-
Region: "us-phoenix-1",
70-
CompartmentOCID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
71-
UserOCID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
72-
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
73-
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
69+
Region: "us-phoenix-1",
70+
CompartmentID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
71+
UserID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
72+
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
73+
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
7474
},
7575
LoadBalancer: LoadBalancerConfig{
7676
Subnet1: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
@@ -85,8 +85,8 @@ func TestValidateConfig(t *testing.T) {
8585
in: &Config{
8686
Auth: AuthConfig{
8787
Region: "us-phoenix-1",
88-
TenancyOCID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
89-
UserOCID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
88+
TenancyID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
89+
UserID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
9090
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
9191
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
9292
},
@@ -100,11 +100,11 @@ func TestValidateConfig(t *testing.T) {
100100
name: "missing_user",
101101
in: &Config{
102102
Auth: AuthConfig{
103-
Region: "us-phoenix-1",
104-
TenancyOCID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
105-
CompartmentOCID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
106-
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
107-
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
103+
Region: "us-phoenix-1",
104+
TenancyID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
105+
CompartmentID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
106+
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
107+
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
108108
},
109109
LoadBalancer: LoadBalancerConfig{
110110
Subnet1: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
@@ -118,11 +118,11 @@ func TestValidateConfig(t *testing.T) {
118118
name: "missing_key",
119119
in: &Config{
120120
Auth: AuthConfig{
121-
Region: "us-phoenix-1",
122-
TenancyOCID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
123-
CompartmentOCID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
124-
UserOCID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
125-
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
121+
Region: "us-phoenix-1",
122+
TenancyID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
123+
CompartmentID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
124+
UserID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
125+
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
126126
},
127127
LoadBalancer: LoadBalancerConfig{
128128
Subnet1: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
@@ -136,11 +136,11 @@ func TestValidateConfig(t *testing.T) {
136136
name: "missing_figerprint",
137137
in: &Config{
138138
Auth: AuthConfig{
139-
Region: "us-phoenix-1",
140-
TenancyOCID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
141-
CompartmentOCID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
142-
UserOCID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
143-
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
139+
Region: "us-phoenix-1",
140+
TenancyID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
141+
CompartmentID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
142+
UserID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
143+
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
144144
},
145145
LoadBalancer: LoadBalancerConfig{
146146
Subnet1: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
@@ -154,12 +154,12 @@ func TestValidateConfig(t *testing.T) {
154154
name: "missing_subnet1",
155155
in: &Config{
156156
Auth: AuthConfig{
157-
Region: "us-phoenix-1",
158-
TenancyOCID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
159-
CompartmentOCID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
160-
UserOCID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
161-
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
162-
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
157+
Region: "us-phoenix-1",
158+
TenancyID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
159+
CompartmentID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
160+
UserID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
161+
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
162+
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
163163
},
164164
LoadBalancer: LoadBalancerConfig{
165165
Subnet2: "ocid1.subnet.oc1.phx.aaaaaaaahuxrgvs65iwdz7ekwgg3l5gyah7ww5klkwjcso74u3e4i64hvtvq",
@@ -172,12 +172,12 @@ func TestValidateConfig(t *testing.T) {
172172
name: "missing_subnet2",
173173
in: &Config{
174174
Auth: AuthConfig{
175-
Region: "us-phoenix-1",
176-
TenancyOCID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
177-
CompartmentOCID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
178-
UserOCID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
179-
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
180-
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
175+
Region: "us-phoenix-1",
176+
TenancyID: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",
177+
CompartmentID: "ocid1.compartment.oc1..aaaaaaaa3um2atybwhder4qttfhgon4j3hcxgmsvnyvx4flfjyewkkwfzwnq",
178+
UserID: "ocid1.user.oc1..aaaaaaaai77mql2xerv7cn6wu3nhxang3y4jk56vo5bn5l5lysl34avnui3q",
179+
PrivateKey: "-----BEGIN RSA PRIVATE KEY----- (etc)",
180+
Fingerprint: "8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74",
181181
},
182182
LoadBalancer: LoadBalancerConfig{
183183
Subnet1: "ocid1.tenancy.oc1..aaaaaaaatyn7scrtwtqedvgrxgr2xunzeo6uanvyhzxqblctwkrpisvke4kq",

‎pkg/oci/instances.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ func extractNodeAddressesFromVNIC(vnic *core.Vnic) ([]api.NodeAddress, error) {
7878
func (cp *CloudProvider) NodeAddresses(ctx context.Context, name types.NodeName) ([]api.NodeAddress, error) {
7979
glog.V(4).Infof("NodeAddresses(%q) called", name)
8080

81-
inst, err := cp.client.Compute().GetInstanceByNodeName(ctx, cp.config.Auth.CompartmentOCID, cp.config.VCNID, mapNodeNameToInstanceName(name))
81+
inst, err := cp.client.Compute().GetInstanceByNodeName(ctx, cp.config.CompartmentID, cp.config.VCNID, mapNodeNameToInstanceName(name))
8282
if err != nil {
8383
return nil, errors.Wrap(err, "GetInstanceByNodeName")
8484
}
8585

86-
vnic, err := cp.client.Compute().GetPrimaryVNICForInstance(ctx, cp.config.Auth.CompartmentOCID, *inst.Id)
86+
vnic, err := cp.client.Compute().GetPrimaryVNICForInstance(ctx, cp.config.CompartmentID, *inst.Id)
8787
if err != nil {
8888
return nil, errors.Wrap(err, "GetPrimaryVNICForInstance")
8989
}
@@ -98,7 +98,7 @@ func (cp *CloudProvider) NodeAddresses(ctx context.Context, name types.NodeName)
9898
func (cp *CloudProvider) NodeAddressesByProviderID(ctx context.Context, providerID string) ([]api.NodeAddress, error) {
9999
glog.V(4).Infof("NodeAddressesByProviderID(%q) called", providerID)
100100
instanceID := util.MapProviderIDToInstanceID(providerID)
101-
vnic, err := cp.client.Compute().GetPrimaryVNICForInstance(ctx, cp.config.Auth.CompartmentOCID, instanceID)
101+
vnic, err := cp.client.Compute().GetPrimaryVNICForInstance(ctx, cp.config.CompartmentID, instanceID)
102102
if err != nil {
103103
return nil, errors.Wrap(err, "GetPrimaryVNICForInstance")
104104
}
@@ -112,7 +112,7 @@ func (cp *CloudProvider) ExternalID(ctx context.Context, nodeName types.NodeName
112112
glog.V(4).Infof("ExternalID(%q) called", nodeName)
113113

114114
instName := mapNodeNameToInstanceName(nodeName)
115-
inst, err := cp.client.Compute().GetInstanceByNodeName(ctx, cp.config.Auth.CompartmentOCID, cp.config.VCNID, instName)
115+
inst, err := cp.client.Compute().GetInstanceByNodeName(ctx, cp.config.CompartmentID, cp.config.VCNID, instName)
116116
if client.IsNotFound(err) {
117117
glog.Infof("Instance %q was not found. Unable to get ExternalID: %v", instName, err)
118118
return "", cloudprovider.InstanceNotFound
@@ -131,7 +131,7 @@ func (cp *CloudProvider) InstanceID(ctx context.Context, nodeName types.NodeName
131131
glog.V(4).Infof("InstanceID(%q) called", nodeName)
132132

133133
name := mapNodeNameToInstanceName(nodeName)
134-
inst, err := cp.client.Compute().GetInstanceByNodeName(ctx, cp.config.Auth.CompartmentOCID, cp.config.VCNID, name)
134+
inst, err := cp.client.Compute().GetInstanceByNodeName(ctx, cp.config.CompartmentID, cp.config.VCNID, name)
135135
if err != nil {
136136
if client.IsNotFound(err) {
137137
return "", cloudprovider.InstanceNotFound
@@ -145,7 +145,7 @@ func (cp *CloudProvider) InstanceID(ctx context.Context, nodeName types.NodeName
145145
func (cp *CloudProvider) InstanceType(ctx context.Context, name types.NodeName) (string, error) {
146146
glog.V(4).Infof("InstanceType(%q) called", name)
147147

148-
inst, err := cp.client.Compute().GetInstanceByNodeName(ctx, cp.config.Auth.CompartmentOCID, cp.config.VCNID, mapNodeNameToInstanceName(name))
148+
inst, err := cp.client.Compute().GetInstanceByNodeName(ctx, cp.config.CompartmentID, cp.config.VCNID, mapNodeNameToInstanceName(name))
149149
if err != nil {
150150
return "", errors.Wrap(err, "GetInstanceByNodeName")
151151
}

0 commit comments

Comments
 (0)