github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

integration: svm: use consistent path args pattern in etcd fetch functions

Browse Source 
Use function argument order at which the strings would appear
in the etcd path.
This commit is contained in:
Stanislav Láznička
2025-02-19 15:22:53 +01:00
parent e1557f80a2
commit 80966ce5c4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/storageversionmigrator/storageversionmigrator_test.go
View File

@@ -89,7 +89,7 @@ func TestStorageVersionMigration(t *testing.T) {
} }
wantPrefix := "k8s:enc:aescbc:v1:key2" wantPrefix := "k8s:enc:aescbc:v1:key2"
etcdSecret, err := svmTest.getRawSecretFromETCD(t, secret.Name, secret.Namespace) etcdSecret, err := svmTest.getRawSecretFromETCD(t, secret.Namespace, secret.Name)
if err != nil { if err != nil {
t.Fatalf("Failed to get secret from etcd: %v", err) t.Fatalf("Failed to get secret from etcd: %v", err)
} }

14
test/integration/storageversionmigrator/util.go
View File

@@ -387,9 +387,9 @@ func (svm *svmTest) createSecret(ctx context.Context, t *testing.T, name, namesp
return svm.client.CoreV1().Secrets(secret.Namespace).Create(ctx, secret, metav1.CreateOptions{}) return svm.client.CoreV1().Secrets(secret.Namespace).Create(ctx, secret, metav1.CreateOptions{})
} }
func (svm *svmTest) getRawSecretFromETCD(t *testing.T, name, namespace string) ([]byte, error) { func (svm *svmTest) getRawSecretFromETCD(t *testing.T, namespace, name string) ([]byte, error) {
t.Helper() t.Helper()
secretETCDPath := getETCDPathForResource(t, svm.storageConfig.Prefix, "", "secrets", name, namespace) secretETCDPath := getETCDPathForResource(t, svm.storageConfig.Prefix, "", "secrets", namespace, name)
etcdResponse, err := svm.readRawRecordFromETCD(t, secretETCDPath) etcdResponse, err := svm.readRawRecordFromETCD(t, secretETCDPath)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to read %s from etcd: %w", secretETCDPath, err) return nil, fmt.Errorf("failed to read %s from etcd: %w", secretETCDPath, err)
@@ -397,7 +397,7 @@ func (svm *svmTest) getRawSecretFromETCD(t *testing.T, name, namespace string) (
return etcdResponse.Kvs[0].Value, nil return etcdResponse.Kvs[0].Value, nil
} }
func getETCDPathForResource(t *testing.T, storagePrefix, group, resource, name, namespaceName string) string { func getETCDPathForResource(t *testing.T, storagePrefix, group, resource, namespaceName, name string) string {
t.Helper() t.Helper()
groupResource := resource groupResource := resource
if group != "" { if group != "" {
@@ -431,9 +431,9 @@ func (svm *svmTest) readRawRecordFromETCD(t *testing.T, path string) (*clientv3.
return response, nil return response, nil
} }
func (svm *svmTest) getRawCRFromETCD(t *testing.T, name, namespace, crdGroup, crdName string) ([]byte, error) { func (svm *svmTest) getRawCRFromETCD(t *testing.T, crdGroup, crdName, namespace, name string) ([]byte, error) {
t.Helper() t.Helper()
crdETCDPath := getETCDPathForResource(t, svm.storageConfig.Prefix, crdGroup, crdName, name, namespace) crdETCDPath := getETCDPathForResource(t, svm.storageConfig.Prefix, crdGroup, crdName, namespace, name)
etcdResponse, err := svm.readRawRecordFromETCD(t, crdETCDPath) etcdResponse, err := svm.readRawRecordFromETCD(t, crdETCDPath)
if err != nil { if err != nil {
t.Fatalf("failed to read %s from etcd: %v", crdETCDPath, err) t.Fatalf("failed to read %s from etcd: %v", crdETCDPath, err)
@@ -1056,7 +1056,7 @@ func (svm *svmTest) setupServerCert(t *testing.T) *certContext {
func (svm *svmTest) isCRStoredAtVersion(t *testing.T, version, crName string) bool { func (svm *svmTest) isCRStoredAtVersion(t *testing.T, version, crName string) bool {
t.Helper() t.Helper()
data, err := svm.getRawCRFromETCD(t, crName, defaultNamespace, crdGroup, crdName+"s") data, err := svm.getRawCRFromETCD(t, crdGroup, crdName+"s", defaultNamespace, crName)
if err != nil { if err != nil {
t.Fatalf("Failed to get CR from etcd: %v", err) t.Fatalf("Failed to get CR from etcd: %v", err)
} }
@@ -1135,7 +1135,7 @@ func (svm *svmTest) validateRVAndGeneration(ctx context.Context, t *testing.T, c
for crName, version := range crVersions { for crName, version := range crVersions {
// get CR from etcd // get CR from etcd
data, err := svm.getRawCRFromETCD(t, crName, defaultNamespace, crdGroup, crdName+"s") data, err := svm.getRawCRFromETCD(t, crdGroup, crdName+"s", defaultNamespace, crName)
if err != nil { if err != nil {
t.Fatalf("Failed to get CR from etcd: %v", err) t.Fatalf("Failed to get CR from etcd: %v", err)
} }