github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106624 from Ahmed-Aghadi/codeEnhanceCommonStorage

Browse Source 
test/e2e/common/storage: enhance assertions
This commit is contained in:
Kubernetes Prow Robot 2022-01-06 08:57:25 -08:00 committed by GitHub
commit 8c9837ed0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/common/storage/configmap_volume.go
View File

@ -518,17 +518,23 @@ var _ = SIGDescribe("ConfigMap", func() {
// Ensure data can't be changed now. // Ensure data can't be changed now.
currentConfigMap.Data["data-5"] = "value-5" currentConfigMap.Data["data-5"] = "value-5"
_, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Update(context.TODO(), currentConfigMap, metav1.UpdateOptions{}) _, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Update(context.TODO(), currentConfigMap, metav1.UpdateOptions{})
framework.ExpectEqual(apierrors.IsInvalid(err), true) if !apierrors.IsInvalid(err) {
framework.Failf("expected 'invalid' as error, got instead: %v", err)
}
// Ensure config map can't be switched from immutable to mutable. // Ensure config map can't be switched from immutable to mutable.
currentConfigMap, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{}) currentConfigMap, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{})
framework.ExpectNoError(err, "Failed to get config map %q in namespace %q", configMap.Name, configMap.Namespace) framework.ExpectNoError(err, "Failed to get config map %q in namespace %q", configMap.Name, configMap.Namespace)
framework.ExpectEqual(*currentConfigMap.Immutable, true) if !*currentConfigMap.Immutable {
framework.Failf("currentConfigMap %s can be switched from immutable to mutable", currentConfigMap.Name)
}
falseVal := false falseVal := false
currentConfigMap.Immutable = &falseVal currentConfigMap.Immutable = &falseVal
_, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Update(context.TODO(), currentConfigMap, metav1.UpdateOptions{}) _, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Update(context.TODO(), currentConfigMap, metav1.UpdateOptions{})
framework.ExpectEqual(apierrors.IsInvalid(err), true) if !apierrors.IsInvalid(err) {
framework.Failf("expected 'invalid' as error, got instead: %v", err)
}
// Ensure that metadata can be changed. // Ensure that metadata can be changed.
currentConfigMap, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{}) currentConfigMap, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{})

12
test/e2e/common/storage/secrets_volume.go
View File

@ -400,17 +400,23 @@ var _ = SIGDescribe("Secrets", func() {
// Ensure data can't be changed now. // Ensure data can't be changed now.
currentSecret.Data["data-5"] = []byte("value-5\n") currentSecret.Data["data-5"] = []byte("value-5\n")
_, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Update(context.TODO(), currentSecret, metav1.UpdateOptions{}) _, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Update(context.TODO(), currentSecret, metav1.UpdateOptions{})
framework.ExpectEqual(apierrors.IsInvalid(err), true) if !apierrors.IsInvalid(err) {
framework.Failf("expected 'invalid' as error, got instead: %v", err)
}
// Ensure secret can't be switched from immutable to mutable. // Ensure secret can't be switched from immutable to mutable.
currentSecret, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{}) currentSecret, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{})
framework.ExpectNoError(err, "Failed to get secret %q in namespace %q", secret.Name, secret.Namespace) framework.ExpectNoError(err, "Failed to get secret %q in namespace %q", secret.Name, secret.Namespace)
framework.ExpectEqual(*currentSecret.Immutable, true) if !*currentSecret.Immutable {
framework.Failf("currentSecret %s can be switched from immutable to mutable", currentSecret.Name)
}
falseVal := false falseVal := false
currentSecret.Immutable = &falseVal currentSecret.Immutable = &falseVal
_, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Update(context.TODO(), currentSecret, metav1.UpdateOptions{}) _, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Update(context.TODO(), currentSecret, metav1.UpdateOptions{})
framework.ExpectEqual(apierrors.IsInvalid(err), true) if !apierrors.IsInvalid(err) {
framework.Failf("expected 'invalid' as error, got instead: %v", err)
}
// Ensure that metadata can be changed. // Ensure that metadata can be changed.
currentSecret, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{}) currentSecret, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{})