Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/expansion/fixtures/fixtures.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ kind: Pod
metadata:
labels:
app: nginx
name: nginx-deployment-pod
namespace: default
spec:
containers:
Expand All @@ -108,6 +109,7 @@ kind: Pod
metadata:
labels:
app: nginx
name: nginx-deployment-pod
namespace: default
spec:
containers:
Expand All @@ -126,6 +128,7 @@ kind: Pod
metadata:
labels:
app: nginx
name: nginx-deployment-pod
namespace: default
spec:
containers:
Expand All @@ -145,6 +148,7 @@ metadata:
app: nginx
annotations:
owner: admin
name: nginx-deployment-pod
namespace: default
spec:
containers:
Expand Down Expand Up @@ -396,6 +400,7 @@ metadata:
sound: meow
labels:
fluffy: extremely
name: big-chungus-kitten
namespace: default
spec:
breed: calico
Expand All @@ -409,6 +414,7 @@ kind: Purr
metadata:
annotations:
shouldPet: manytimes
name: big-chungus-purr
namespace: default
spec:
loud: very
Expand Down
15 changes: 15 additions & 0 deletions pkg/expansion/system.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,25 @@ func expandResource(obj *unstructured.Unstructured, ns *corev1.Namespace, templa
resource.SetUnstructuredContent(src)
resource.SetGroupVersionKind(resultantGVK)
resource.SetNamespace(ns.Name)
resource.SetName(mockNameForResource(obj, resultantGVK))

return resource, nil
}

// mockNameForResource returns a mock name for a resultant resource created
// from expanding `gen`. The name will be of the form:
// "<generator name>-<resultant kind>". For example, a deployment named
// `nginx-deployment` will produce a resultant named `nginx-deployment-pod`.
func mockNameForResource(gen *unstructured.Unstructured, gvk schema.GroupVersionKind) string {
Comment thread
davis-haba marked this conversation as resolved.
name := gen.GetName()
if gvk.Kind != "" {
name += "-"
}
name += gvk.Kind

return strings.ToLower(name)
}

func NewSystem(mutationSystem *mutation.System) *System {
return &System{
lock: sync.RWMutex{},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Pod
metadata:
labels:
app: nginx
name: nginx-deployment-pod
spec:
containers:
- args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
owner: admin
labels:
app: nginx
name: nginx-deployment-pod
spec:
containers:
- args:
Expand Down
2 changes: 2 additions & 0 deletions test/gator/expand/fixtures/expand-cr/output/output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Purr
metadata:
annotations:
shouldPet: manytimes
name: big-chungus-purr
spec:
loud: very
---
Expand All @@ -13,6 +14,7 @@ metadata:
sound: meow
labels:
fluffy: extremely
name: big-chungus-kitten
spec:
age: 10
breed: calico
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Pod
metadata:
labels:
app: nginx
name: nginx-deployment-pod
namespace: my-ns
spec:
containers:
Expand Down