metropolis: remove stutter in ClusterConfiguration.KubernetesConfig
We already know this is a config (it lives in ClusterConfiguration), no
need to call that a config again.
This doesn't break any compatibility yet as field names are not (yet)
under a stability guarantee.
Change-Id: Ib6492d1c8303cbd0620b979b8047ec9757e301c0
Reviewed-on: https://review.monogon.dev/c/monogon/+/3594
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/test/e2e/suites/kubernetes/run_test.go b/metropolis/test/e2e/suites/kubernetes/run_test.go
index f815c57..e7e7962 100644
--- a/metropolis/test/e2e/suites/kubernetes/run_test.go
+++ b/metropolis/test/e2e/suites/kubernetes/run_test.go
@@ -75,8 +75,8 @@
ClusterDomain: "cluster.test",
TpmMode: cpb.ClusterConfiguration_TPM_MODE_DISABLED,
StorageSecurityPolicy: cpb.ClusterConfiguration_STORAGE_SECURITY_POLICY_NEEDS_INSECURE,
- KubernetesConfig: &cpb.ClusterConfiguration_KubernetesConfig{
- NodeLabelsToSynchronize: []*cpb.ClusterConfiguration_KubernetesConfig_NodeLabelsToSynchronize{
+ Kubernetes: &cpb.ClusterConfiguration_Kubernetes{
+ NodeLabelsToSynchronize: []*cpb.ClusterConfiguration_Kubernetes_NodeLabelsToSynchronize{
{Regexp: `^test\.monogon\.dev/`},
},
},
@@ -216,17 +216,17 @@
// Reconfigure node label rules.
_, err = mgmt.ConfigureCluster(ctx, &apb.ConfigureClusterRequest{
BaseConfig: &cpb.ClusterConfiguration{
- KubernetesConfig: &cpb.ClusterConfiguration_KubernetesConfig{
- NodeLabelsToSynchronize: []*cpb.ClusterConfiguration_KubernetesConfig_NodeLabelsToSynchronize{
+ Kubernetes: &cpb.ClusterConfiguration_Kubernetes{
+ NodeLabelsToSynchronize: []*cpb.ClusterConfiguration_Kubernetes_NodeLabelsToSynchronize{
{Regexp: `^test\.monogon\.dev/`},
},
},
},
NewConfig: &cpb.ClusterConfiguration{
- KubernetesConfig: &cpb.ClusterConfiguration_KubernetesConfig{},
+ Kubernetes: &cpb.ClusterConfiguration_Kubernetes{},
},
UpdateMask: &fieldmaskpb.FieldMask{
- Paths: []string{"kubernetes_config.node_labels_to_synchronize"},
+ Paths: []string{"kubernetes.node_labels_to_synchronize"},
},
})
if err != nil {
@@ -238,7 +238,7 @@
t.Fatalf("Could not get cluster info")
}
// See if the config changed.
- if rules := ci.ClusterConfiguration.KubernetesConfig.NodeLabelsToSynchronize; len(rules) != 0 {
+ if rules := ci.ClusterConfiguration.Kubernetes.NodeLabelsToSynchronize; len(rules) != 0 {
t.Fatalf("Wanted 0 label rules in config after reconfiguration, have %d: %v", len(rules), rules)
}
// TODO: ensure new rules get applied, but that will require watching the cluster
diff --git a/metropolis/test/launch/cli/launch-cluster/main.go b/metropolis/test/launch/cli/launch-cluster/main.go
index 793cc28..f5e0537 100644
--- a/metropolis/test/launch/cli/launch-cluster/main.go
+++ b/metropolis/test/launch/cli/launch-cluster/main.go
@@ -135,8 +135,8 @@
func main() {
clusterConfig := cpb.ClusterConfiguration{
- KubernetesConfig: &cpb.ClusterConfiguration_KubernetesConfig{
- NodeLabelsToSynchronize: []*cpb.ClusterConfiguration_KubernetesConfig_NodeLabelsToSynchronize{
+ Kubernetes: &cpb.ClusterConfiguration_Kubernetes{
+ NodeLabelsToSynchronize: []*cpb.ClusterConfiguration_Kubernetes_NodeLabelsToSynchronize{
{Regexp: "^" + mlaunch.NodeNumberKey + "$"},
},
},