Skip to content

Commit

Permalink
refactor(kubernetes/oracle): remove unread kubernetes/settings.ts and…
Browse files Browse the repository at this point in the history
… oracle defaults (#8321)

* refactor(kubernetes): remove unread settings.ts

Only the legacy (V1) provider read from these settings; they V2 provider does not require a statically supplied
default account or namespace.

* refactor(oracle): remove unused oracle template from halconfig/settings.js

It appears that Halyard's DeckProfileFactory has never actually hydrated any Oracle defaults, so I'm not sure why this was added to Deck.
  • Loading branch information
maggieneterval committed Jun 2, 2020
1 parent a53ff8f commit 7bb785c
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 34 deletions.
14 changes: 0 additions & 14 deletions app/scripts/modules/kubernetes/src/kubernetes.settings.ts

This file was deleted.

14 changes: 0 additions & 14 deletions halconfig/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,12 @@ var gce = {
zone: '{%google.default.zone%}',
},
};
var kubernetes = {
defaults: {
account: '{%kubernetes.default.account%}',
namespace: '{%kubernetes.default.namespace%}',
},
};
var huaweicloud = {
defaults: {
account: '{%huaweicloud.default.account%}',
region: '{%huaweicloud.default.region%}',
},
};
var oracle = {
defaults: {
account: '{%oracle.default.account%}',
region: '{%oracle.default.region%}',
},
};
var tencentcloud = {
defaults: {
account: '{%tencentcloud.default.account%}',
Expand Down Expand Up @@ -154,8 +142,6 @@ window.spinnakerSettings = {
ecs: ecs,
gce: gce,
huaweicloud: huaweicloud,
kubernetes: kubernetes,
oracle: oracle,
tencentcloud: tencentcloud,
},
version: version,
Expand Down
6 changes: 0 additions & 6 deletions settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,6 @@ window.spinnakerSettings = {
region: 'cn-north-1',
},
},
kubernetes: {
defaults: {
account: 'my-kubernetes-account',
namespace: 'default',
},
},
oracle: {
defaults: {
account: 'DEFAULT',
Expand Down

0 comments on commit 7bb785c

Please sign in to comment.