Switch core master base images from debian to distroless

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Yuwen Ma
2019-05-02 10:12:38 -07:00
committed by Davanum Srinivas
parent ba3bf32300
commit 1aa67fc525
12 changed files with 90 additions and 31 deletions

View File

@@ -45,11 +45,6 @@ type kubeAPIServerEnv struct {
func TestEncryptionProviderFlag(t *testing.T) {
var (
// command": [
// "/bin/sh", - Index 0
// "-c", - Index 1
// "exec /usr/local/bin/kube-apiserver " - Index 2
execArgsIndex = 2
encryptionConfigFlag = "--encryption-provider-config"
)
@@ -83,13 +78,13 @@ func TestEncryptionProviderFlag(t *testing.T) {
c.mustInvokeFunc(
e,
kubeAPIServerConfigScriptName,
[]string{"configure-helper.sh", kubeAPIServerConfigScriptName},
"kms.template",
"testdata/kube-apiserver/base.template",
"testdata/kube-apiserver/kms.template")
c.mustLoadPodFromManifest()
execArgs := c.pod.Spec.Containers[0].Command[execArgsIndex]
execArgs := strings.Join(c.pod.Spec.Containers[0].Command, " ")
flagIsInArg := strings.Contains(execArgs, encryptionConfigFlag)
flag := fmt.Sprintf("%s=%s", encryptionConfigFlag, e.EncryptionProviderConfigPath)
@@ -118,7 +113,7 @@ func TestEncryptionProviderConfig(t *testing.T) {
c.mustInvokeFunc(
e,
kubeAPIServerConfigScriptName,
[]string{"configure-helper.sh", kubeAPIServerConfigScriptName},
"kms.template",
"testdata/kube-apiserver/base.template",
@@ -189,7 +184,7 @@ func TestKMSIntegration(t *testing.T) {
c.mustInvokeFunc(
e,
kubeAPIServerConfigScriptName,
[]string{"configure-helper.sh", kubeAPIServerConfigScriptName},
"kms.template",
"testdata/kube-apiserver/base.template",