mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-04 15:05:20 +00:00
Fixup event object reference generation to allow downstream objects to have an event
This commit is contained in:
@@ -19,7 +19,8 @@ package api
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
|
||||
@@ -31,8 +32,6 @@ var (
|
||||
ErrNoSelfLink = errors.New("selfLink was empty, can't make reference")
|
||||
)
|
||||
|
||||
var versionFromSelfLink = regexp.MustCompile("/api/([^/]*)/")
|
||||
|
||||
// ForTesting_ReferencesAllowBlankSelfLinks can be set to true in tests to avoid
|
||||
// "ErrNoSelfLink" errors.
|
||||
var ForTesting_ReferencesAllowBlankSelfLinks = false
|
||||
@@ -40,6 +39,7 @@ var ForTesting_ReferencesAllowBlankSelfLinks = false
|
||||
// GetReference returns an ObjectReference which refers to the given
|
||||
// object, or an error if the object doesn't follow the conventions
|
||||
// that would allow this.
|
||||
// TODO: should take a meta.Interface see https://github.com/GoogleCloudPlatform/kubernetes/issues/7127
|
||||
func GetReference(obj runtime.Object) (*ObjectReference, error) {
|
||||
if obj == nil {
|
||||
return nil, ErrNilObject
|
||||
@@ -52,23 +52,41 @@ func GetReference(obj runtime.Object) (*ObjectReference, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, kind, err := Scheme.ObjectVersionAndKind(obj)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
version := ""
|
||||
parsedSelfLink := versionFromSelfLink.FindStringSubmatch(meta.SelfLink())
|
||||
if len(parsedSelfLink) < 2 {
|
||||
if ForTesting_ReferencesAllowBlankSelfLinks {
|
||||
version = "testing"
|
||||
} else if meta.SelfLink() == "" {
|
||||
return nil, ErrNoSelfLink
|
||||
} else {
|
||||
return nil, fmt.Errorf("unexpected self link format: '%v'; got version '%v'", meta.SelfLink(), version)
|
||||
|
||||
// if the object referenced is actually persisted, we can just get kind from meta
|
||||
// if we are building an object reference to something not yet persisted, we should fallback to scheme
|
||||
kind := meta.Kind()
|
||||
if kind == "" {
|
||||
_, kind, err = Scheme.ObjectVersionAndKind(obj)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
} else {
|
||||
version = parsedSelfLink[1]
|
||||
}
|
||||
|
||||
// if the object referenced is actually persisted, we can also get version from meta
|
||||
version := meta.APIVersion()
|
||||
if version == "" {
|
||||
selfLink := meta.SelfLink()
|
||||
if selfLink == "" {
|
||||
if ForTesting_ReferencesAllowBlankSelfLinks {
|
||||
version = "testing"
|
||||
} else {
|
||||
return nil, ErrNoSelfLink
|
||||
}
|
||||
} else {
|
||||
selfLinkUrl, err := url.Parse(selfLink)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// example paths: /<prefix>/<version>/*
|
||||
parts := strings.Split(selfLinkUrl.Path, "/")
|
||||
if len(parts) < 3 {
|
||||
return nil, fmt.Errorf("unexpected self link format: '%v'; got version '%v'", selfLink, version)
|
||||
}
|
||||
version = parts[2]
|
||||
}
|
||||
}
|
||||
|
||||
return &ObjectReference{
|
||||
Kind: kind,
|
||||
APIVersion: version,
|
||||
|
||||
Reference in New Issue
Block a user