mirror of
https://github.com/coredns/coredns.git
synced 2026-08-20 23:08:28 -04:00
bc74540f54
* plugin/kubernetes: copy Labels in Pod.DeepCopyObject Pod.DeepCopyObject built the copy field by field and left Labels out, so every copy came back unlabelled. Every other object in this package copies all of its fields; Pod was the only one missing any. Labels feeds the kubernetes/client-label/<key> metadata, so anything that reached a pod through a deep copy would see no labels at all rather than an error. Nothing does today - DefaultProcessor stores the converted object straight into the indexer without copying it, which is why this has not surfaced - so this is a latent bug rather than a live one. Clone the map instead of assigning it, so the copy does not alias the original. maps.Clone returns nil for a nil map, so an unlabelled pod stays unlabelled and a round trip does not turn a nil map into an empty one. The test covers every runtime.Object in the package rather than just Pod, and refuses to pass if a fixture leaves a field at its zero value. Adding a field to any of these types therefore fails the test until the fixture sets it, which is what makes the round-trip assertion cover the new field too. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Manuel Rüger <manuel@rueg.eu> * plugin/kubernetes/object: deep copy the Service and ServiceImport ports The deepcopy tests claimed a package-wide guarantee that a copy shares nothing with its original, but only checked it for Pod and a hand-written Endpoints value. Both api.ServicePort and mcs.ServicePort hold an AppProtocol *string, so the elementwise copy(s1.Ports, s.Ports) in Service.DeepCopyObject and ServiceImport.DeepCopyObject left the copy pointing at the original's string. Mutating it through either side was visible from the other, and the tests still passed. Copy the ports with the generated DeepCopyInto so the copy owns everything it can reach, and make the guarantee real: TestDeepCopyObjectIsDeep now runs over every case in deepCopyCases, mutates every value reachable through a pointer, slice, or map, and requires the copy to still equal a pristine fixture. A type that gains a reference-bearing field is covered as soon as assertAllFieldsSet forces the fixture to populate it, rather than needing a new hand-written case. Failure messages render as JSON, because %+v prints an aliased pointer field as an address and hides the value that actually differs. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Manuel Rüger <manuel@rueg.eu> --------- Signed-off-by: Manuel Rüger <manuel@rueg.eu> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
101 lines
2.9 KiB
Go
101 lines
2.9 KiB
Go
package object
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
mcs "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
|
|
)
|
|
|
|
// ServiceImport is a stripped down api.ServiceImport with only the items we need for CoreDNS.
|
|
type ServiceImport struct {
|
|
Version string
|
|
Name string
|
|
Namespace string
|
|
Index string
|
|
ClusterIPs []string
|
|
Type mcs.ServiceImportType
|
|
Ports []mcs.ServicePort
|
|
|
|
*Empty
|
|
}
|
|
|
|
// ServiceImportKey returns a string using for the index.
|
|
func ServiceImportKey(name, namespace string) string { return name + "." + namespace }
|
|
|
|
// ToServiceImport converts an v1alpha1.ServiceImport to a *ServiceImport.
|
|
func ToServiceImport(obj meta.Object) (meta.Object, error) {
|
|
svc, ok := obj.(*mcs.ServiceImport)
|
|
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected object %v", obj)
|
|
}
|
|
s := &ServiceImport{
|
|
Version: svc.GetResourceVersion(),
|
|
Name: svc.GetName(),
|
|
Namespace: svc.GetNamespace(),
|
|
Index: ServiceImportKey(svc.GetName(), svc.GetNamespace()),
|
|
Type: svc.Spec.Type,
|
|
}
|
|
|
|
if len(svc.Spec.IPs) > 0 {
|
|
s.ClusterIPs = make([]string, len(svc.Spec.IPs))
|
|
copy(s.ClusterIPs, svc.Spec.IPs)
|
|
}
|
|
|
|
if len(svc.Spec.Ports) > 0 {
|
|
s.Ports = make([]mcs.ServicePort, len(svc.Spec.Ports))
|
|
copy(s.Ports, svc.Spec.Ports)
|
|
}
|
|
|
|
*svc = mcs.ServiceImport{}
|
|
return s, nil
|
|
}
|
|
|
|
var _ runtime.Object = &ServiceImport{}
|
|
|
|
// Headless returns true if the service is headless
|
|
func (s *ServiceImport) Headless() bool {
|
|
return s.Type == mcs.Headless
|
|
}
|
|
|
|
// DeepCopyObject implements the ObjectKind interface.
|
|
func (s *ServiceImport) DeepCopyObject() runtime.Object {
|
|
s1 := &ServiceImport{
|
|
Version: s.Version,
|
|
Name: s.Name,
|
|
Namespace: s.Namespace,
|
|
Index: s.Index,
|
|
Type: s.Type,
|
|
ClusterIPs: make([]string, len(s.ClusterIPs)),
|
|
Ports: make([]mcs.ServicePort, len(s.Ports)),
|
|
}
|
|
copy(s1.ClusterIPs, s.ClusterIPs)
|
|
// mcs.ServicePort holds an AppProtocol *string, so copying the slice elementwise
|
|
// would leave both imports pointing at the same string. Use the generated deep
|
|
// copy so the copy owns everything it can reach.
|
|
for i := range s.Ports {
|
|
s.Ports[i].DeepCopyInto(&s1.Ports[i])
|
|
}
|
|
return s1
|
|
}
|
|
|
|
// GetNamespace implements the metav1.Object interface.
|
|
func (s *ServiceImport) GetNamespace() string { return s.Namespace }
|
|
|
|
// SetNamespace implements the metav1.Object interface.
|
|
func (s *ServiceImport) SetNamespace(_namespace string) {}
|
|
|
|
// GetName implements the metav1.Object interface.
|
|
func (s *ServiceImport) GetName() string { return s.Name }
|
|
|
|
// SetName implements the metav1.Object interface.
|
|
func (s *ServiceImport) SetName(_name string) {}
|
|
|
|
// GetResourceVersion implements the metav1.Object interface.
|
|
func (s *ServiceImport) GetResourceVersion() string { return s.Version }
|
|
|
|
// SetResourceVersion implements the metav1.Object interface.
|
|
func (s *ServiceImport) SetResourceVersion(_version string) {}
|