From 3011f18047210dd4668517780f5279ad46289090 Mon Sep 17 00:00:00 2001 From: Jesse Dubay Date: Sat, 16 Mar 2019 19:11:42 -0700 Subject: [PATCH 1/3] Sort default varReference config by kind, path --- .../config/defaultconfig/varreference.go | 200 +++++++++--------- 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/pkg/transformers/config/defaultconfig/varreference.go b/pkg/transformers/config/defaultconfig/varreference.go index 77bffbeda..cead95708 100644 --- a/pkg/transformers/config/defaultconfig/varreference.go +++ b/pkg/transformers/config/defaultconfig/varreference.go @@ -19,98 +19,68 @@ package defaultconfig const ( varReferenceFieldSpecs = ` varReference: -- path: spec/template/spec/initContainers/command - kind: StatefulSet - -- path: spec/template/spec/containers/command - kind: StatefulSet - -- path: spec/template/spec/initContainers/command - kind: Deployment - -- path: spec/template/spec/containers/command - kind: Deployment - -- path: spec/template/spec/initContainers/command - kind: DaemonSet - -- path: spec/template/spec/containers/command - kind: DaemonSet - -- path: spec/template/spec/containers/command - kind: Job +- path: spec/jobTemplate/spec/template/spec/containers/args + kind: CronJob - path: spec/jobTemplate/spec/template/spec/containers/command kind: CronJob -- path: spec/template/spec/initContainers/args - kind: StatefulSet - -- path: spec/template/spec/containers/args - kind: StatefulSet - -- path: spec/template/spec/initContainers/args - kind: Deployment - -- path: spec/template/spec/containers/args - kind: Deployment - -- path: spec/template/spec/initContainers/args - kind: DaemonSet - -- path: spec/template/spec/containers/args - kind: DaemonSet - -- path: spec/template/spec/containers/args - kind: Job - -- path: spec/jobTemplate/spec/template/spec/containers/args - kind: CronJob - -- path: spec/template/spec/initContainers/env/value - kind: StatefulSet - -- path: spec/template/spec/containers/env/value - kind: StatefulSet - -- path: spec/template/spec/initContainers/env/value - kind: Deployment - -- path: spec/template/spec/containers/env/value - kind: Deployment - -- path: spec/template/spec/initContainers/env/value - kind: DaemonSet - -- path: spec/template/spec/containers/env/value - kind: DaemonSet - -- path: spec/template/spec/containers/env/value - kind: Job - -- path: spec/template/spec/initContainers/env/value - kind: Job - - path: spec/jobTemplate/spec/template/spec/containers/env/value kind: CronJob -- path: spec/containers/command - kind: Pod +- path: spec/template/spec/containers/volumeMounts/mountPath + kind: CronJob -- path: spec/containers/args - kind: Pod +- path: spec/template/spec/initContainers/volumeMounts/mountPath + kind: CronJob -- path: spec/containers/env/value - kind: Pod +- path: spec/template/spec/containers/args + kind: DaemonSet -- path: spec/initContainers/command - kind: Pod +- path: spec/template/spec/containers/command + kind: DaemonSet -- path: spec/initContainers/args - kind: Pod +- path: spec/template/spec/containers/env/value + kind: DaemonSet -- path: spec/initContainers/env/value - kind: Pod +- path: spec/template/spec/containers/volumeMounts/mountPath + kind: DaemonSet + +- path: spec/template/spec/initContainers/args + kind: DaemonSet + +- path: spec/template/spec/initContainers/command + kind: DaemonSet + +- path: spec/template/spec/initContainers/env/value + kind: DaemonSet + +- path: spec/template/spec/initContainers/volumeMounts/mountPath + kind: DaemonSet + +- path: spec/template/spec/containers/args + kind: Deployment + +- path: spec/template/spec/containers/command + kind: Deployment + +- path: spec/template/spec/containers/env/value + kind: Deployment + +- path: spec/template/spec/containers/volumeMounts/mountPath + kind: Deployment + +- path: spec/template/spec/initContainers/args + kind: Deployment + +- path: spec/template/spec/initContainers/command + kind: Deployment + +- path: spec/template/spec/initContainers/env/value + kind: Deployment + +- path: spec/template/spec/initContainers/volumeMounts/mountPath + kind: Deployment - path: spec/rules/host kind: Ingress @@ -118,15 +88,45 @@ varReference: - path: spec/tls/hosts kind: Ingress +- path: spec/template/spec/containers/args + kind: Job + +- path: spec/template/spec/containers/command + kind: Job + +- path: spec/template/spec/containers/env/value + kind: Job + - path: spec/template/spec/containers/volumeMounts/mountPath - kind: StatefulSet + kind: Job + +- path: spec/template/spec/initContainers/env/value + kind: Job - path: spec/template/spec/initContainers/volumeMounts/mountPath - kind: StatefulSet + kind: Job + +- path: spec/containers/args + kind: Pod + +- path: spec/containers/command + kind: Pod + +- path: spec/containers/env/value + kind: Pod - path: spec/containers/volumeMounts/mountPath kind: Pod +- path: spec/initContainers/args + kind: Pod + +- path: spec/initContainers/command + kind: Pod + +- path: spec/initContainers/env/value + kind: Pod + - path: spec/initContainers/volumeMounts/mountPath kind: Pod @@ -136,29 +136,29 @@ varReference: - path: spec/template/spec/initContainers/volumeMounts/mountPath kind: ReplicaSet -- path: spec/template/spec/containers/volumeMounts/mountPath - kind: Job +- path: spec/template/spec/containers/args + kind: StatefulSet -- path: spec/template/spec/initContainers/volumeMounts/mountPath - kind: Job +- path: spec/template/spec/containers/command + kind: StatefulSet + +- path: spec/template/spec/containers/env/value + kind: StatefulSet - path: spec/template/spec/containers/volumeMounts/mountPath - kind: CronJob + kind: StatefulSet + +- path: spec/template/spec/initContainers/args + kind: StatefulSet + +- path: spec/template/spec/initContainers/command + kind: StatefulSet + +- path: spec/template/spec/initContainers/env/value + kind: StatefulSet - path: spec/template/spec/initContainers/volumeMounts/mountPath - kind: CronJob - -- path: spec/template/spec/containers/volumeMounts/mountPath - kind: DaemonSet - -- path: spec/template/spec/initContainers/volumeMounts/mountPath - kind: DaemonSet - -- path: spec/template/spec/containers/volumeMounts/mountPath - kind: Deployment - -- path: spec/template/spec/initContainers/volumeMounts/mountPath - kind: Deployment + kind: StatefulSet - path: metadata/labels ` From e207ae4c01aef23e099a4e7732bc46488fd3fdcc Mon Sep 17 00:00:00 2001 From: Jesse Dubay Date: Sat, 16 Mar 2019 19:12:58 -0700 Subject: [PATCH 2/3] Fix incorrect default varrefs for CronJob volumeMounts --- pkg/transformers/config/defaultconfig/varreference.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/transformers/config/defaultconfig/varreference.go b/pkg/transformers/config/defaultconfig/varreference.go index cead95708..9314eb7db 100644 --- a/pkg/transformers/config/defaultconfig/varreference.go +++ b/pkg/transformers/config/defaultconfig/varreference.go @@ -28,10 +28,10 @@ varReference: - path: spec/jobTemplate/spec/template/spec/containers/env/value kind: CronJob -- path: spec/template/spec/containers/volumeMounts/mountPath +- path: spec/jobTemplate/spec/template/spec/containers/volumeMounts/mountPath kind: CronJob -- path: spec/template/spec/initContainers/volumeMounts/mountPath +- path: spec/jobTemplate/spec/template/spec/initContainers/volumeMounts/mountPath kind: CronJob - path: spec/template/spec/containers/args From 31091a8df2004786697e708770d28b5658de5b09 Mon Sep 17 00:00:00 2001 From: Jesse Dubay Date: Sat, 16 Mar 2019 19:15:56 -0700 Subject: [PATCH 3/3] Fix missing varrefs for CronJob, Job, ReplicaSet --- .../config/defaultconfig/varreference.go | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pkg/transformers/config/defaultconfig/varreference.go b/pkg/transformers/config/defaultconfig/varreference.go index 9314eb7db..5f89dfd4f 100644 --- a/pkg/transformers/config/defaultconfig/varreference.go +++ b/pkg/transformers/config/defaultconfig/varreference.go @@ -31,6 +31,15 @@ varReference: - path: spec/jobTemplate/spec/template/spec/containers/volumeMounts/mountPath kind: CronJob +- path: spec/jobTemplate/spec/template/spec/initContainers/args + kind: CronJob + +- path: spec/jobTemplate/spec/template/spec/initContainers/command + kind: CronJob + +- path: spec/jobTemplate/spec/template/spec/initContainers/env/value + kind: CronJob + - path: spec/jobTemplate/spec/template/spec/initContainers/volumeMounts/mountPath kind: CronJob @@ -100,6 +109,12 @@ varReference: - path: spec/template/spec/containers/volumeMounts/mountPath kind: Job +- path: spec/template/spec/initContainers/args + kind: Job + +- path: spec/template/spec/initContainers/command + kind: Job + - path: spec/template/spec/initContainers/env/value kind: Job @@ -130,9 +145,27 @@ varReference: - path: spec/initContainers/volumeMounts/mountPath kind: Pod +- path: spec/template/spec/containers/args + kind: ReplicaSet + +- path: spec/template/spec/containers/command + kind: ReplicaSet + +- path: spec/template/spec/containers/env/value + kind: ReplicaSet + - path: spec/template/spec/containers/volumeMounts/mountPath kind: ReplicaSet +- path: spec/template/spec/initContainers/args + kind: ReplicaSet + +- path: spec/template/spec/initContainers/command + kind: ReplicaSet + +- path: spec/template/spec/initContainers/env/value + kind: ReplicaSet + - path: spec/template/spec/initContainers/volumeMounts/mountPath kind: ReplicaSet