fix: remove repair-malformed-updates deprecated flag (#492)

Azure · Feb 13, 2019 · b37cda9 · b37cda9
1 parent 0a6c592
commit b37cda9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/docs/topics/clusterdefinitions.md b/docs/topics/clusterdefinitions.md
@@ -436,7 +436,7 @@ Below is a list of apiserver options that are _not_ currently user-configurable,
 | "--etcd-keyfile"                            | "/etc/kubernetes/certs/etcdclient.key"                                                  |
 | "--etcd-servers"                            | _calculated value that represents etcd servers_                                         |
 | "--profiling"                               | "false"                                                                                 |
-| "--repair-malformed-updates"                | "false"                                                                                 |
+| "--repair-malformed-updates"                | "false"  (_deprecated in v1.14_)                                                           |
 | "--tls-cert-file"                           | "/etc/kubernetes/certs/apiserver.crt"                                                   |
 | "--tls-private-key-file"                    | "/etc/kubernetes/certs/apiserver.key"                                                   |
 | "--client-ca-file"                          | "/etc/kubernetes/certs/ca.crt"                                                          |

diff --git a/pkg/api/defaults-apiserver.go b/pkg/api/defaults-apiserver.go
@@ -137,6 +137,13 @@ func (cs *ContainerService) setAPIServerConfig() {
 			delete(o.KubernetesConfig.APIServerConfig, key)
 		}
 	}
+	// Enforce flags removal that don't work with specific versions, to accommodate upgrade
+	// Remove flags that are not compatible with 1.14
+	if common.IsKubernetesVersionGe(o.OrchestratorVersion, "1.14.0-alpha.1") {
+		for _, key := range []string{"--repair-malformed-updates"} {
+			delete(o.KubernetesConfig.APIServerConfig, key)
+		}
+	}
 }
 
 func getDefaultAdmissionControls(cs *ContainerService) (string, string) {

diff --git a/pkg/api/defaults-apiserver_test.go b/pkg/api/defaults-apiserver_test.go
@@ -399,3 +399,23 @@ func TestAPIServerConfigEnableProfiling(t *testing.T) {
 			a["--profiling"])
 	}
 }
+
+func TestAPIServerConfigRepairMalformedUpdates(t *testing.T) {
+	// Test default
+	cs := CreateMockContainerService("testcluster", "1.13.0", 3, 2, false)
+	cs.setAPIServerConfig()
+	a := cs.Properties.OrchestratorProfile.KubernetesConfig.APIServerConfig
+	if a["--repair-malformed-updates"] != "false" {
+		t.Fatalf("got unexpected default value for '--repair-malformed-updates' API server config: %s",
+			a["--repair-malformed-updates"])
+	}
+
+	// Validate that 1.14.0 doesn't include --repair-malformed-updates at all
+	cs = CreateMockContainerService("testcluster", "1.14.0", 3, 2, false)
+	cs.setAPIServerConfig()
+	a = cs.Properties.OrchestratorProfile.KubernetesConfig.APIServerConfig
+	if _, ok := a["--repair-malformed-updates"]; ok {
+		t.Fatalf("got a value for the deprecated '--repair-malformed-updates' API server config: %s",
+			a["--repair-malformed-updates"])
+	}
+}