Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kor for openSUSE:Factory checked in at 2024-12-10 23:49:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kor (Old) and /work/SRC/openSUSE:Factory/.kor.new.29675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kor" Tue Dec 10 23:49:05 2024 rev:25 rq:1229772 version:0.5.7 Changes: -------- --- /work/SRC/openSUSE:Factory/kor/kor.changes 2024-10-30 17:35:00.801707547 +0100 +++ /work/SRC/openSUSE:Factory/.kor.new.29675/kor.changes 2024-12-10 23:49:05.754460296 +0100 @@ -1,0 +2,13 @@ +Tue Dec 10 11:50:18 UTC 2024 - [email protected] + +- Update to version 0.5.7: + * chore: bump chart pre release (#389) + * Fix: Check initContainers if they have env vars from a + configmap or a secret (#388) + * refactor: Use new filter framework & unused labels (#387) + * Fix: Removes duplicate printing of the included namespaces + (#383) + * chore(deps): bump k8s.io/apiextensions-apiserver from 0.31.2 to + 0.31.3 (#382) + +------------------------------------------------------------------- Old: ---- kor-0.5.6.obscpio New: ---- kor-0.5.7.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kor.spec ++++++ --- /var/tmp/diff_new_pack.F3zsIk/_old 2024-12-10 23:49:07.426529901 +0100 +++ /var/tmp/diff_new_pack.F3zsIk/_new 2024-12-10 23:49:07.426529901 +0100 @@ -17,7 +17,7 @@ Name: kor -Version: 0.5.6 +Version: 0.5.7 Release: 0 Summary: Tool to discover unused Kubernetes Resources License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.F3zsIk/_old 2024-12-10 23:49:07.458531233 +0100 +++ /var/tmp/diff_new_pack.F3zsIk/_new 2024-12-10 23:49:07.462531399 +0100 @@ -3,9 +3,9 @@ <param name="url">https://github.com/yonahd/kor</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.5.6</param> + <param name="revision">v0.5.7</param> <!-- the helm-related tag kor-0.1.xx is sitting on the same commit... --> - <param name="match-tag">v0.5.6</param> + <param name="match-tag">v0.5.7</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.F3zsIk/_old 2024-12-10 23:49:07.482532232 +0100 +++ /var/tmp/diff_new_pack.F3zsIk/_new 2024-12-10 23:49:07.486532398 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/yonahd/kor</param> - <param name="changesrevision">e848178f9bc37a135aecbe44501f8fa63e51f5ab</param></service></servicedata> + <param name="changesrevision">378eedf49f4aa52cfa14dd86471cae40e50a339d</param></service></servicedata> (No newline at EOF) ++++++ kor-0.5.6.obscpio -> kor-0.5.7.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/charts/kor/Chart.yaml new/kor-0.5.7/charts/kor/Chart.yaml --- old/kor-0.5.6/charts/kor/Chart.yaml 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/charts/kor/Chart.yaml 2024-12-10 12:01:30.000000000 +0100 @@ -2,8 +2,8 @@ name: kor description: A Kubernetes Helm Chart to discover orphaned resources using kor type: application -version: 0.1.14 -appVersion: "0.5.6" +version: 0.1.15 +appVersion: "0.5.7" maintainers: - name: "yonahd" url: "https://github.com/yonahd/kor"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/charts/kor/README.md new/kor-0.5.7/charts/kor/README.md --- old/kor-0.5.6/charts/kor/README.md 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/charts/kor/README.md 2024-12-10 12:01:30.000000000 +0100 @@ -1,6 +1,6 @@ # kor -   +   A Kubernetes Helm Chart to discover orphaned resources using kor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/go.mod new/kor-0.5.7/go.mod --- old/kor-0.5.6/go.mod 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/go.mod 2024-12-10 12:01:30.000000000 +0100 @@ -7,10 +7,10 @@ github.com/olekukonko/tablewriter v0.0.5 github.com/prometheus/client_golang v1.20.5 github.com/spf13/cobra v1.8.1 - k8s.io/api v0.31.2 - k8s.io/apiextensions-apiserver v0.31.2 - k8s.io/apimachinery v0.31.2 - k8s.io/client-go v0.31.2 + k8s.io/api v0.31.3 + k8s.io/apiextensions-apiserver v0.31.3 + k8s.io/apimachinery v0.31.3 + k8s.io/client-go v0.31.3 k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 sigs.k8s.io/yaml v1.4.0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/go.sum new/kor-0.5.7/go.sum --- old/kor-0.5.6/go.sum 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/go.sum 2024-12-10 12:01:30.000000000 +0100 @@ -178,20 +178,18 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= -k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= -k8s.io/apiextensions-apiserver v0.31.2 h1:W8EwUb8+WXBLu56ser5IudT2cOho0gAKeTOnywBLxd0= -k8s.io/apiextensions-apiserver v0.31.2/go.mod h1:i+Geh+nGCJEGiCGR3MlBDkS7koHIIKWVfWeRFiOsUcM= -k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw= -k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc= -k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs= +k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8= +k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE= +k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE= +k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4= +k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4= +k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4= +k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI= k8s.io/utils v0.0.0-20240921022957-49e7df575cb6/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/filters/options.go new/kor-0.5.7/pkg/filters/options.go --- old/kor-0.5.6/pkg/filters/options.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/filters/options.go 2024-12-10 12:01:30.000000000 +0100 @@ -5,6 +5,7 @@ "errors" "fmt" "os" + "slices" "strings" "sync" "time" @@ -120,6 +121,8 @@ excludeNamespaces := o.ExcludeNamespaces if len(o.IncludeNamespaces) > 0 { + slices.Sort(includeNamespaces) + includeNamespaces = slices.Compact(includeNamespaces) for _, ns := range includeNamespaces { @@ -138,10 +141,6 @@ } for _, ns := range namespaceList.Items { - namespacesMap[ns.Name] = false - } - - for _, ns := range namespaceList.Items { namespacesMap[ns.Name] = true } for _, ns := range excludeNamespaces { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/configmaps.go new/kor-0.5.7/pkg/kor/configmaps.go --- old/kor-0.5.6/pkg/kor/configmaps.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/configmaps.go 2024-12-10 12:01:30.000000000 +0100 @@ -72,6 +72,11 @@ envFromInitContainerCM = append(envFromInitContainerCM, env.ValueFrom.ConfigMapKeyRef.Name) } } + for _, envFrom := range initContainer.EnvFrom { + if envFrom.ConfigMapRef != nil { + envFromInitContainerCM = append(envFromInitContainerCM, envFrom.ConfigMapRef.Name) + } + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/configmaps_test.go new/kor-0.5.7/pkg/kor/configmaps_test.go --- old/kor-0.5.6/pkg/kor/configmaps_test.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/configmaps_test.go 2024-12-10 12:01:30.000000000 +0100 @@ -58,6 +58,12 @@ t.Fatalf("Error creating fake configmap: %v", err) } + configmap6 := CreateTestConfigmap(testNamespace, "configmap-6", AppLabels) + _, err = clientset.CoreV1().ConfigMaps(testNamespace).Create(context.TODO(), configmap6, metav1.CreateOptions{}) + if err != nil { + t.Fatalf("Error creating fake configmap: %v", err) + } + pod1 := CreateTestPod(testNamespace, "pod-1", "", []corev1.Volume{ { Name: "vol-1", @@ -98,6 +104,17 @@ }, } + pod5 := CreateTestPod(testNamespace, "pod-5", "", nil, AppLabels) + pod5.Spec.InitContainers = []corev1.Container{ + { + EnvFrom: []corev1.EnvFromSource{ + { + ConfigMapRef: &corev1.ConfigMapEnvSource{LocalObjectReference: corev1.LocalObjectReference{Name: configmap6.ObjectMeta.Name}}, + }, + }, + }, + } + _, err = clientset.CoreV1().Pods(testNamespace).Create(context.TODO(), pod1, metav1.CreateOptions{}) if err != nil { t.Fatalf("Error creating fake pod: %v", err) @@ -118,6 +135,11 @@ t.Fatalf("Error creating fake pod: %v", err) } + _, err = clientset.CoreV1().Pods(testNamespace).Create(context.TODO(), pod5, metav1.CreateOptions{}) + if err != nil { + t.Fatalf("Error creating fake pod: %v", err) + } + return clientset } @@ -134,6 +156,7 @@ "configmap-1", "configmap-2", "configmap-3", + "configmap-6", } if !equalSlices(configMapNames, expectedConfigMapNames) { t.Errorf("Expected configmap names %v, got %v", expectedConfigMapNames, configMapNames) @@ -188,11 +211,10 @@ t.Errorf("Expected envFrom configmaps %v, got %v", expectedEnvFromContainerCM, envFromContainerCM) } - expectedEnvFromInitContainerCM := []string{"configmap-2"} + expectedEnvFromInitContainerCM := []string{"configmap-2", "configmap-6"} if !equalSlices(envFromInitContainerCM, expectedEnvFromInitContainerCM) { t.Errorf("Expected initContainer env configmaps %v, got %v", expectedEnvFromInitContainerCM, envFromInitContainerCM) } - } func TestGetUnusedConfigmapsStructured(t *testing.T) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/crds.go new/kor-0.5.7/pkg/kor/crds.go --- old/kor-0.5.6/pkg/kor/crds.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/crds.go 2024-12-10 12:01:30.000000000 +0100 @@ -36,7 +36,13 @@ } for _, crd := range crds.Items { - if pass := filters.KorLabelFilter(&crd, &filters.Options{}); pass { + if pass, _ := filter.SetObject(&crd).Run(filterOpts); pass { + continue + } + + if crd.Labels["kor/used"] == "false" { + reason := "Marked with unused label" + unusedCRDs = append(unusedCRDs, ResourceInfo{Name: crd.Name, Reason: reason}) continue } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/jobs.go new/kor-0.5.7/pkg/kor/jobs.go --- old/kor-0.5.6/pkg/kor/jobs.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/jobs.go 2024-12-10 12:01:30.000000000 +0100 @@ -38,6 +38,12 @@ continue } + if job.Labels["kor/used"] == "false" { + reason := "Marked with unused label" + unusedJobNames = append(unusedJobNames, ResourceInfo{Name: job.Name, Reason: reason}) + continue + } + exceptionFound, err := isResourceException(job.Name, job.Namespace, config.ExceptionJobs) if err != nil { return nil, err diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/pods.go new/kor-0.5.7/pkg/kor/pods.go --- old/kor-0.5.6/pkg/kor/pods.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/pods.go 2024-12-10 12:01:30.000000000 +0100 @@ -24,7 +24,7 @@ var evictedPods []ResourceInfo for _, pod := range podsList.Items { - if pass := filters.KorLabelFilter(&pod, &filters.Options{}); pass { + if pass, _ := filter.SetObject(&pod).Run(filterOpts); pass { continue } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/pv.go new/kor-0.5.7/pkg/kor/pv.go --- old/kor-0.5.6/pkg/kor/pv.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/pv.go 2024-12-10 12:01:30.000000000 +0100 @@ -24,7 +24,7 @@ var unusedPvs []ResourceInfo for _, pv := range pvs.Items { - if pass := filters.KorLabelFilter(&pv, &filters.Options{}); pass { + if pass, _ := filter.SetObject(&pv).Run(filterOpts); pass { continue } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/pvc.go new/kor-0.5.7/pkg/kor/pvc.go --- old/kor-0.5.6/pkg/kor/pvc.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/pvc.go 2024-12-10 12:01:30.000000000 +0100 @@ -42,7 +42,7 @@ var unusedPvcNames []string pvcNames := make([]string, 0, len(pvcs.Items)) for _, pvc := range pvcs.Items { - if pass := filters.KorLabelFilter(&pvc, &filters.Options{}); pass { + if pass, _ := filter.SetObject(&pvc).Run(filterOpts); pass { continue } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/replicaset.go new/kor-0.5.7/pkg/kor/replicaset.go --- old/kor-0.5.6/pkg/kor/replicaset.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/replicaset.go 2024-12-10 12:01:30.000000000 +0100 @@ -27,6 +27,12 @@ continue } + if replicaSet.Labels["kor/used"] == "false" { + reason := "Marked with unused label" + unusedReplicaSetNames = append(unusedReplicaSetNames, ResourceInfo{Name: replicaSet.Name, Reason: reason}) + continue + } + // if the replicaSet is specified 0 replica and current available & ready & fullyLabeled replica count is all 0, think the replicaSet is completed if *replicaSet.Spec.Replicas == 0 && replicaSet.Status.AvailableReplicas == 0 && replicaSet.Status.ReadyReplicas == 0 && replicaSet.Status.FullyLabeledReplicas == 0 { reason := "ReplicaSet is not in use" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/rolebindings.go new/kor-0.5.7/pkg/kor/rolebindings.go --- old/kor-0.5.6/pkg/kor/rolebindings.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/rolebindings.go 2024-12-10 12:01:30.000000000 +0100 @@ -85,6 +85,12 @@ continue } + if rb.Labels["kor/used"] == "false" { + reason := "Marked with unused label" + unusedRoleBindingNames = append(unusedRoleBindingNames, ResourceInfo{Name: rb.Name, Reason: reason}) + continue + } + if exceptionFound, err := isResourceException(rb.Name, rb.Namespace, config.ExceptionRoleBindings); err != nil { return nil, err } else if exceptionFound { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/roles.go new/kor-0.5.7/pkg/kor/roles.go --- old/kor-0.5.6/pkg/kor/roles.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/roles.go 2024-12-10 12:01:30.000000000 +0100 @@ -53,9 +53,10 @@ var unusedRoleNames []string names := make([]string, 0, len(roles.Items)) for _, role := range roles.Items { - if pass := filters.KorLabelFilter(&role, &filters.Options{}); pass { + if pass, _ := filter.SetObject(&role).Run(filterOpts); pass { continue } + if role.Labels["kor/used"] == "false" { unusedRoleNames = append(unusedRoleNames, role.Name) continue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/secrets.go new/kor-0.5.7/pkg/kor/secrets.go --- old/kor-0.5.6/pkg/kor/secrets.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/secrets.go 2024-12-10 12:01:30.000000000 +0100 @@ -79,6 +79,11 @@ initContainerEnvSecrets = append(initContainerEnvSecrets, env.ValueFrom.SecretKeyRef.Name) } } + for _, envFrom := range initContainer.EnvFrom { + if envFrom.SecretRef != nil { + initContainerEnvSecrets = append(initContainerEnvSecrets, envFrom.SecretRef.Name) + } + } } for _, volume := range pod.Spec.Volumes { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/secrets_test.go new/kor-0.5.7/pkg/kor/secrets_test.go --- old/kor-0.5.6/pkg/kor/secrets_test.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/secrets_test.go 2024-12-10 12:01:30.000000000 +0100 @@ -33,6 +33,7 @@ secret3 := CreateTestSecret(testNamespace, "test-secret3", AppLabels) secret4 := CreateTestSecret(testNamespace, "test-secret4", UsedLabels) secret5 := CreateTestSecret(testNamespace, "test-secret5", UnusedLabels) + secret6 := CreateTestSecret(testNamespace, "test-secret6", AppLabels) pod1 := CreateTestPod(testNamespace, "pod-1", "", []corev1.Volume{ { @@ -87,6 +88,15 @@ {Name: secret2.ObjectMeta.Name}, } + pod7 := CreateTestPod(testNamespace, "pod-7", "", nil, AppLabels) + pod7.Spec.InitContainers = []corev1.Container{ + { + EnvFrom: []corev1.EnvFromSource{ + {SecretRef: &corev1.SecretEnvSource{LocalObjectReference: corev1.LocalObjectReference{Name: secret6.ObjectMeta.Name}}}, + }, + }, + } + _, err = clientset.CoreV1().Pods(testNamespace).Create(context.TODO(), pod1, v1.CreateOptions{}) if err != nil { t.Fatalf("Error creating fake pod: %v", err) @@ -117,6 +127,11 @@ t.Fatalf("Error creating fake pod: %v", err) } + _, err = clientset.CoreV1().Pods(testNamespace).Create(context.TODO(), pod7, v1.CreateOptions{}) + if err != nil { + t.Fatalf("Error creating fake pod: %v", err) + } + _, err = clientset.CoreV1().Secrets(testNamespace).Create(context.TODO(), secret1, v1.CreateOptions{}) if err != nil { t.Fatalf("Error creating fake %s: %v", "Secret", err) @@ -142,6 +157,11 @@ t.Fatalf("Error creating fake %s: %v", "Secret", err) } + _, err = clientset.CoreV1().Secrets(testNamespace).Create(context.TODO(), secret6, v1.CreateOptions{}) + if err != nil { + t.Fatalf("Error creating fake %s: %v", "Secret", err) + } + return clientset } @@ -209,7 +229,7 @@ t.Errorf("Expected envFrom secrets %v, got %v", expectedEnvSecrets2, envSecrets2) } - expectedInitContainerEnvSecrets := []string{"test-secret1"} + expectedInitContainerEnvSecrets := []string{"test-secret1", "test-secret6"} if !equalSlices(initContainerEnvSecrets, expectedInitContainerEnvSecrets) { t.Errorf("Expected initContainer env secrets %v, got %v", expectedInitContainerEnvSecrets, initContainerEnvSecrets) } @@ -265,11 +285,11 @@ } if len(unusedSecrets) != 2 { - t.Errorf("Expected 2 used Secret objects, got %d", len(unusedSecrets)) + t.Errorf("Expected 2 unused Secret objects, got %d", len(unusedSecrets)) } if !resourceInfoContains(unusedSecrets, "test-secret3") { - t.Error("Expected specific Secret in the list") + t.Error("Expected specific Secret in the list") } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kor-0.5.6/pkg/kor/storageclasses.go new/kor-0.5.7/pkg/kor/storageclasses.go --- old/kor-0.5.6/pkg/kor/storageclasses.go 2024-10-28 18:52:00.000000000 +0100 +++ new/kor-0.5.7/pkg/kor/storageclasses.go 2024-12-10 12:01:30.000000000 +0100 @@ -66,7 +66,7 @@ storageClassNames := make([]string, 0, len(scs.Items)) for _, sc := range scs.Items { - if pass := filters.KorLabelFilter(&sc, &filters.Options{}); pass { + if pass, _ := filter.SetObject(&sc).Run(filterOpts); pass { continue } ++++++ kor.obsinfo ++++++ --- /var/tmp/diff_new_pack.F3zsIk/_old 2024-12-10 23:49:07.650539226 +0100 +++ /var/tmp/diff_new_pack.F3zsIk/_new 2024-12-10 23:49:07.654539392 +0100 @@ -1,5 +1,5 @@ name: kor -version: 0.5.6 -mtime: 1730137920 -commit: e848178f9bc37a135aecbe44501f8fa63e51f5ab +version: 0.5.7 +mtime: 1733828490 +commit: 378eedf49f4aa52cfa14dd86471cae40e50a339d ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/kor/vendor.tar.gz /work/SRC/openSUSE:Factory/.kor.new.29675/vendor.tar.gz differ: char 5, line 1
