fix(deck): create empty providers.kubernetes entry if provider is ena…

…bled (#108) As explained in this [PR](spinnaker/deck#8381), the Kubernetes provider does not have any statically configured defaults in Deck. However, the registration of the Kubernetes cloud provider in Deck depends on the truthiness of `providers.kubernetes`.
spinnaker · Jun 25, 2020 · 85d1f3c · 85d1f3c
1 parent 0c7699f
commit 85d1f3c
Show file tree

Hide file tree

Showing 6 changed files with 272 additions and 155 deletions.
diff --git a/api/client/config/deck.pb.go b/api/client/config/deck.pb.go
diff --git a/api/proto/config/deck.proto b/api/proto/config/deck.proto
@@ -161,6 +161,8 @@ message Deck {
     // Tencent Cloud provider defaults.
     TencentCloud tencentcloud = 9;
 
+    Kubernetes kubernetes = 10;
+
     message Appengine {
       Defaults defaults = 1;
       message Defaults {
@@ -230,5 +232,10 @@ message Deck {
         string region = 2;
       }
     }
+
+    // The Kubernetes provider has no statically-configured defaults,
+    // but Deck currently registers each cloud provider based on the existence
+    // of an entry in the `providers` block.
+    message Kubernetes {}
   }
 }
diff --git a/docs/docs.md b/docs/docs.md
@@ -231,6 +231,7 @@
     - [Deck.Providers.Gce.Defaults](#proto.config.Deck.Providers.Gce.Defaults)
     - [Deck.Providers.HuaweiCloud](#proto.config.Deck.Providers.HuaweiCloud)
     - [Deck.Providers.HuaweiCloud.Defaults](#proto.config.Deck.Providers.HuaweiCloud.Defaults)
+    - [Deck.Providers.Kubernetes](#proto.config.Deck.Providers.Kubernetes)
     - [Deck.Providers.TencentCloud](#proto.config.Deck.Providers.TencentCloud)
     - [Deck.Providers.TencentCloud.Defaults](#proto.config.Deck.Providers.TencentCloud.Defaults)
 
@@ -3450,6 +3451,7 @@ UI-specific provider default settings.
 | gce | [Deck.Providers.Gce](#proto.config.Deck.Providers.Gce) |  | GCE provider defaults. |
 | huaweicloud | [Deck.Providers.HuaweiCloud](#proto.config.Deck.Providers.HuaweiCloud) |  | Huawei Cloud provider defaults. |
 | tencentcloud | [Deck.Providers.TencentCloud](#proto.config.Deck.Providers.TencentCloud) |  | Tencent Cloud provider defaults. |
+| kubernetes | [Deck.Providers.Kubernetes](#proto.config.Deck.Providers.Kubernetes) |  |  |
 
 
 
@@ -3700,6 +3702,18 @@ UI-specific provider default settings.
 
 
 
+<a name="proto.config.Deck.Providers.Kubernetes"></a>
+
+### Deck.Providers.Kubernetes
+The Kubernetes provider has no statically-configured defaults,
+but Deck currently registers each cloud provider based on the existence
+of an entry in the `providers` block.
+
+
+
+
+
+
 <a name="proto.config.Deck.Providers.TencentCloud"></a>
 
 ### Deck.Providers.TencentCloud

diff --git a/internal/convert/deck.go b/internal/convert/deck.go
@@ -222,5 +222,9 @@ func getDeckProvidersConfig(h *config.Hal) *config.Deck_Providers {
 		}
 	}
 
+	if h.GetProviders().GetKubernetes().GetEnabled().GetValue() {
+		providers.Kubernetes = &config.Deck_Providers_Kubernetes{}
+	}
+
 	return providers
 }
diff --git a/internal/convert/deck_test.go b/internal/convert/deck_test.go
@@ -235,6 +235,29 @@ var deckTests = configTest{
 				},
 			},
 		},
+		{
+			"Enabled provider without defaults",
+			&config.Hal{
+				Providers: &cloudprovider.Providers{
+					Kubernetes: &cloudprovider.Kubernetes{
+						Enabled: wrapperspb.Bool(true),
+					},
+				},
+			},
+			&config.Deck{
+				GateUrl:         "http://localhost:8084",
+				AuthEndpoint:    "http://localhost:8084/auth/user",
+				BakeryDetailUrl: "http://localhost:8084/bakery/logs/{{context.region}}/{{context.status.resourceId}}",
+				Canary: &config.Deck_Canary{
+					FeatureDisabled: wrapperspb.Bool(true),
+				},
+				Feature:       &config.Deck_Features{},
+				Notifications: &config.Deck_Notifications{},
+				Providers: &config.Deck_Providers{
+					Kubernetes: &config.Deck_Providers_Kubernetes{},
+				},
+			},
+		},
 		{
 			"Override gate URL",
 			&config.Hal{

diff --git a/testdata/deck.yml b/testdata/deck.yml
@@ -64,5 +64,6 @@ providers:
     defaults:
       account: my-huawei-account
       region: us-east1
+  kubernetes: {}
 defaultTimeZone: America/Chicago
 version: master-latest-unvalidated