From 2a06a174e8a32cd80695d333f7244b93ded332c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Ga=C3=9F?= Date: Mon, 25 Jun 2018 10:38:07 +0200 Subject: [PATCH] Add CronJob to refvars transformer --- .../testcase-variable-ref/expected.diff | 25 +++++++++++++++++++ .../testcase-variable-ref/expected.yaml | 21 ++++++++++++++++ .../in/package/cronjob.yaml | 20 +++++++++++++++ .../in/package/kustomization.yaml | 1 + pkg/transformers/refvars.go | 12 +++++++++ 5 files changed, 79 insertions(+) create mode 100644 pkg/commands/testdata/testcase-variable-ref/in/package/cronjob.yaml diff --git a/pkg/commands/testdata/testcase-variable-ref/expected.diff b/pkg/commands/testdata/testcase-variable-ref/expected.diff index 124aca43e..5af63a66f 100644 --- a/pkg/commands/testdata/testcase-variable-ref/expected.diff +++ b/pkg/commands/testdata/testcase-variable-ref/expected.diff @@ -41,6 +41,31 @@ diff -u -N /tmp/noop/apps_v1beta1_StatefulSet_cockroachdb.yaml /tmp/transformed/ terminationGracePeriodSeconds: 60 volumes: - name: datadir +diff -u -N /tmp/noop/batch_v1beta1_CronJob_cronjob-example.yaml /tmp/transformed/batch_v1beta1_CronJob_cronjob-example.yaml +--- /tmp/noop/batch_v1beta1_CronJob_cronjob-example.yaml YYYY-MM-DD HH:MM:SS ++++ /tmp/transformed/batch_v1beta1_CronJob_cronjob-example.yaml YYYY-MM-DD HH:MM:SS +@@ -1,7 +1,7 @@ + apiVersion: batch/v1beta1 + kind: CronJob + metadata: +- name: base-cronjob-example ++ name: dev-base-cronjob-example + spec: + concurrencyPolicy: Forbid + jobTemplate: +@@ -11,10 +11,10 @@ + containers: + - command: + - echo +- - base-cockroachdb ++ - dev-base-cockroachdb + env: + - name: CDB_PUBLIC_SVC +- value: base-cockroachdb-public ++ value: dev-base-cockroachdb-public + image: cockroachdb/cockroach:v1.1.5 + name: cronjob-example + schedule: '*/1 * * * *' diff -u -N /tmp/noop/policy_v1beta1_PodDisruptionBudget_cockroachdb-budget.yaml /tmp/transformed/policy_v1beta1_PodDisruptionBudget_cockroachdb-budget.yaml --- /tmp/noop/policy_v1beta1_PodDisruptionBudget_cockroachdb-budget.yaml YYYY-MM-DD HH:MM:SS +++ /tmp/transformed/policy_v1beta1_PodDisruptionBudget_cockroachdb-budget.yaml YYYY-MM-DD HH:MM:SS diff --git a/pkg/commands/testdata/testcase-variable-ref/expected.yaml b/pkg/commands/testdata/testcase-variable-ref/expected.yaml index 4a82e01fe..9648d089a 100644 --- a/pkg/commands/testdata/testcase-variable-ref/expected.yaml +++ b/pkg/commands/testdata/testcase-variable-ref/expected.yaml @@ -192,6 +192,27 @@ spec: requests: storage: 1Gi --- +apiVersion: batch/v1beta1 +kind: CronJob +metadata: + name: dev-base-cronjob-example +spec: + concurrencyPolicy: Forbid + jobTemplate: + spec: + template: + spec: + containers: + - command: + - echo + - dev-base-cockroachdb + env: + - name: CDB_PUBLIC_SVC + value: dev-base-cockroachdb-public + image: cockroachdb/cockroach:v1.1.5 + name: cronjob-example + schedule: '*/1 * * * *' +--- apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: diff --git a/pkg/commands/testdata/testcase-variable-ref/in/package/cronjob.yaml b/pkg/commands/testdata/testcase-variable-ref/in/package/cronjob.yaml new file mode 100644 index 000000000..05f09f872 --- /dev/null +++ b/pkg/commands/testdata/testcase-variable-ref/in/package/cronjob.yaml @@ -0,0 +1,20 @@ +apiVersion: batch/v1beta1 +kind: CronJob +metadata: + name: cronjob-example +spec: + schedule: "*/1 * * * *" + concurrencyPolicy: Forbid + jobTemplate: + spec: + template: + spec: + containers: + - name: cronjob-example + image: cockroachdb/cockroach:v1.1.5 + command: + - echo + - "$(CDB_STATEFULSET_NAME)" + env: + - name: CDB_PUBLIC_SVC + value: "$(CDB_PUBLIC_SVC)" diff --git a/pkg/commands/testdata/testcase-variable-ref/in/package/kustomization.yaml b/pkg/commands/testdata/testcase-variable-ref/in/package/kustomization.yaml index cf7e862bd..808140a7a 100644 --- a/pkg/commands/testdata/testcase-variable-ref/in/package/kustomization.yaml +++ b/pkg/commands/testdata/testcase-variable-ref/in/package/kustomization.yaml @@ -1,6 +1,7 @@ namePrefix: base- resources: - cockroachdb-statefulset-secure.yaml + - cronjob.yaml vars: - name: CDB_PUBLIC_SVC objref: diff --git a/pkg/transformers/refvars.go b/pkg/transformers/refvars.go index 3f415727d..d17a989f9 100644 --- a/pkg/transformers/refvars.go +++ b/pkg/transformers/refvars.go @@ -38,6 +38,10 @@ func NewRefVarTransformer(vars map[string]string) (Transformer, error) { GroupVersionKind: &schema.GroupVersionKind{Kind: "Job"}, Path: []string{"spec", "template", "spec", "containers", "command"}, }, + { + GroupVersionKind: &schema.GroupVersionKind{Kind: "CronJob"}, + Path: []string{"spec", "jobTemplate", "spec", "template", "spec", "containers", "command"}, + }, { GroupVersionKind: &schema.GroupVersionKind{Kind: "StatefulSet"}, Path: []string{"spec", "template", "spec", "initContainers", "args"}, @@ -58,6 +62,10 @@ func NewRefVarTransformer(vars map[string]string) (Transformer, error) { GroupVersionKind: &schema.GroupVersionKind{Kind: "Job"}, Path: []string{"spec", "template", "spec", "containers", "args"}, }, + { + GroupVersionKind: &schema.GroupVersionKind{Kind: "CronJob"}, + Path: []string{"spec", "jobTemplate", "spec", "template", "spec", "containers", "args"}, + }, { GroupVersionKind: &schema.GroupVersionKind{Kind: "StatefulSet"}, Path: []string{"spec", "template", "spec", "initContainers", "env", "value"}, @@ -78,6 +86,10 @@ func NewRefVarTransformer(vars map[string]string) (Transformer, error) { GroupVersionKind: &schema.GroupVersionKind{Kind: "Job"}, Path: []string{"spec", "template", "spec", "containers", "env", "value"}, }, + { + GroupVersionKind: &schema.GroupVersionKind{Kind: "CronJob"}, + Path: []string{"spec", "jobTemplate", "spec", "template", "spec", "containers", "env", "value"}, + }, { GroupVersionKind: &schema.GroupVersionKind{Kind: "Pod"}, Path: []string{"spec", "containers", "command"},