Skip to content

Add CronJob support to FindReferencingConfigMaps and FindReferencingS… #7030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ankitdotraider wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add CronJob support to FindReferencingConfigMaps and FindReferencingS… #7030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 50 additions & 0 deletions pkg/app/pipedv1/plugin/kubernetes/provider/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ func FindContainerImages(m Manifest) []string {
// - spec.template.spec.initContainers.envFrom.configMapRef.name
// - spec.template.spec.containers.env.valueFrom.configMapKeyRef.name
// - spec.template.spec.containers.envFrom.configMapRef.name
// - spec.jobTemplate.spec.template.spec.volumes.configMap.name
// - spec.jobTemplate.spec.template.spec.initContainers.env.valueFrom.configMapKeyRef.name
// - spec.jobTemplate.spec.template.spec.initContainers.envFrom.configMapRef.name
// - spec.jobTemplate.spec.template.spec.containers.env.valueFrom.configMapKeyRef.name
// - spec.jobTemplate.spec.template.spec.containers.envFrom.configMapRef.name
func FindReferencingConfigMaps(m Manifest) []string {
var configMaps []string

Expand All @@ -66,6 +71,26 @@ func FindReferencingConfigMaps(m Manifest) []string {
configMaps = append(configMaps, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "volumes", "configMap", "name"); len(n) > 0 {
configMaps = append(configMaps, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "initContainers", "env", "valueFrom", "configMapKeyRef", "name"); len(n) > 0 {
configMaps = append(configMaps, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "initContainers", "envFrom", "configMapRef", "name"); len(n) > 0 {
configMaps = append(configMaps, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "containers", "env", "valueFrom", "configMapKeyRef", "name"); len(n) > 0 {
configMaps = append(configMaps, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "containers", "envFrom", "configMapRef", "name"); len(n) > 0 {
configMaps = append(configMaps, n...)
}

slices.Sort(configMaps)
return slices.Compact(configMaps)
}
Expand All @@ -78,6 +103,11 @@ func FindReferencingConfigMaps(m Manifest) []string {
// - spec.template.spec.initContainers.envFrom.secretRef.name
// - spec.template.spec.containers.env.valueFrom.secretKeyRef.name
// - spec.template.spec.containers.envFrom.secretRef.name
// - spec.jobTemplate.spec.template.spec.volumes.secret.secretName
// - spec.jobTemplate.spec.template.spec.initContainers.env.valueFrom.secretKeyRef.name
// - spec.jobTemplate.spec.template.spec.initContainers.envFrom.secretRef.name
// - spec.jobTemplate.spec.template.spec.containers.env.valueFrom.secretKeyRef.name
// - spec.jobTemplate.spec.template.spec.containers.envFrom.secretRef.name
func FindReferencingSecrets(m Manifest) []string {
var secrets []string

Expand All @@ -101,6 +131,26 @@ func FindReferencingSecrets(m Manifest) []string {
secrets = append(secrets, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "volumes", "secret", "secretName"); len(n) > 0 {
secrets = append(secrets, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "initContainers", "env", "valueFrom", "secretKeyRef", "name"); len(n) > 0 {
secrets = append(secrets, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "initContainers", "envFrom", "secretRef", "name"); len(n) > 0 {
secrets = append(secrets, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "containers", "env", "valueFrom", "secretKeyRef", "name"); len(n) > 0 {
secrets = append(secrets, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "containers", "envFrom", "secretRef", "name"); len(n) > 0 {
secrets = append(secrets, n...)
}

slices.Sort(secrets)
return slices.Compact(secrets)
}
Expand Down
74 changes: 74 additions & 0 deletions pkg/app/pipedv1/plugin/kubernetes/provider/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,43 @@ spec:
"init-configmap-1",
},
},
{
name: "configmap in cronjob",
manifest: `
apiVersion: batch/v1
kind: CronJob
metadata:
name: cronjob-with-configmap
spec:
schedule: "*/5 * * * *"
jobTemplate:
spec:
template:
spec:
containers:
- name: helloworld
image: gcr.io/pipecd/helloworld:v0.5.0
env:
- name: env1
valueFrom:
configMapKeyRef:
name: cronjob-configmap-1
key: key1
volumeMounts:
- name: config
mountPath: /etc/pipecd-config
readOnly: true
volumes:
- name: config
configMap:
name: cronjob-configmap-2
restartPolicy: OnFailure
`,
expected: []string{
"cronjob-configmap-1",
"cronjob-configmap-2",
},
},
}

for _, tc := range testcases {
Expand Down Expand Up @@ -404,6 +441,43 @@ spec:
"secret-2",
},
},
{
name: "secret in cronjob",
manifest: `
apiVersion: batch/v1
kind: CronJob
metadata:
name: cronjob-with-secret
spec:
schedule: "*/5 * * * *"
jobTemplate:
spec:
template:
spec:
containers:
- name: helloworld
image: gcr.io/pipecd/helloworld:v0.5.0
env:
- name: env1
valueFrom:
secretKeyRef:
name: cronjob-secret-1
key: key1
volumeMounts:
- name: config
mountPath: /etc/pipecd-config
readOnly: true
volumes:
- name: config
secret:
secretName: cronjob-secret-2
restartPolicy: OnFailure
`,
expected: []string{
"cronjob-secret-1",
"cronjob-secret-2",
},
},
}

for _, tc := range testcases {
Expand Down
50 changes: 50 additions & 0 deletions pkg/app/pipedv1/plugin/kubernetes_multicluster/provider/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ func FindContainerImages(m Manifest) []string {
// - spec.template.spec.initContainers.envFrom.configMapRef.name
// - spec.template.spec.containers.env.valueFrom.configMapKeyRef.name
// - spec.template.spec.containers.envFrom.configMapRef.name
// - spec.jobTemplate.spec.template.spec.volumes.configMap.name
// - spec.jobTemplate.spec.template.spec.initContainers.env.valueFrom.configMapKeyRef.name
// - spec.jobTemplate.spec.template.spec.initContainers.envFrom.configMapRef.name
// - spec.jobTemplate.spec.template.spec.containers.env.valueFrom.configMapKeyRef.name
// - spec.jobTemplate.spec.template.spec.containers.envFrom.configMapRef.name
func FindReferencingConfigMaps(m Manifest) []string {
var configMaps []string

Expand All @@ -76,6 +81,26 @@ func FindReferencingConfigMaps(m Manifest) []string {
configMaps = append(configMaps, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "volumes", "configMap", "name"); len(n) > 0 {
configMaps = append(configMaps, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "initContainers", "env", "valueFrom", "configMapKeyRef", "name"); len(n) > 0 {
configMaps = append(configMaps, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "initContainers", "envFrom", "configMapRef", "name"); len(n) > 0 {
configMaps = append(configMaps, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "containers", "env", "valueFrom", "configMapKeyRef", "name"); len(n) > 0 {
configMaps = append(configMaps, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "containers", "envFrom", "configMapRef", "name"); len(n) > 0 {
configMaps = append(configMaps, n...)
}

slices.Sort(configMaps)
return slices.Compact(configMaps)
}
Expand All @@ -88,6 +113,11 @@ func FindReferencingConfigMaps(m Manifest) []string {
// - spec.template.spec.initContainers.envFrom.secretRef.name
// - spec.template.spec.containers.env.valueFrom.secretKeyRef.name
// - spec.template.spec.containers.envFrom.secretRef.name
// - spec.jobTemplate.spec.template.spec.volumes.secret.secretName
// - spec.jobTemplate.spec.template.spec.initContainers.env.valueFrom.secretKeyRef.name
// - spec.jobTemplate.spec.template.spec.initContainers.envFrom.secretRef.name
// - spec.jobTemplate.spec.template.spec.containers.env.valueFrom.secretKeyRef.name
// - spec.jobTemplate.spec.template.spec.containers.envFrom.secretRef.name
func FindReferencingSecrets(m Manifest) []string {
var secrets []string

Expand All @@ -111,6 +141,26 @@ func FindReferencingSecrets(m Manifest) []string {
secrets = append(secrets, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "volumes", "secret", "secretName"); len(n) > 0 {
secrets = append(secrets, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "initContainers", "env", "valueFrom", "secretKeyRef", "name"); len(n) > 0 {
secrets = append(secrets, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "initContainers", "envFrom", "secretRef", "name"); len(n) > 0 {
secrets = append(secrets, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "containers", "env", "valueFrom", "secretKeyRef", "name"); len(n) > 0 {
secrets = append(secrets, n...)
}

if n := nestedStringSlice(m.body.Object, "spec", "jobTemplate", "spec", "template", "spec", "containers", "envFrom", "secretRef", "name"); len(n) > 0 {
secrets = append(secrets, n...)
}

slices.Sort(secrets)
return slices.Compact(secrets)
}
Expand Down
74 changes: 74 additions & 0 deletions pkg/app/pipedv1/plugin/kubernetes_multicluster/provider/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,43 @@ spec:
"init-configmap-1",
},
},
{
name: "configmap in cronjob",
manifest: `
apiVersion: batch/v1
kind: CronJob
metadata:
name: cronjob-with-configmap
spec:
schedule: "*/5 * * * *"
jobTemplate:
spec:
template:
spec:
containers:
- name: helloworld
image: gcr.io/pipecd/helloworld:v0.5.0
env:
- name: env1
valueFrom:
configMapKeyRef:
name: cronjob-configmap-1
key: key1
volumeMounts:
- name: config
mountPath: /etc/pipecd-config
readOnly: true
volumes:
- name: config
configMap:
name: cronjob-configmap-2
restartPolicy: OnFailure
`,
expected: []string{
"cronjob-configmap-1",
"cronjob-configmap-2",
},
},
}

for _, tc := range testcases {
Expand Down Expand Up @@ -404,6 +441,43 @@ spec:
"secret-2",
},
},
{
name: "secret in cronjob",
manifest: `
apiVersion: batch/v1
kind: CronJob
metadata:
name: cronjob-with-secret
spec:
schedule: "*/5 * * * *"
jobTemplate:
spec:
template:
spec:
containers:
- name: helloworld
image: gcr.io/pipecd/helloworld:v0.5.0
env:
- name: env1
valueFrom:
secretKeyRef:
name: cronjob-secret-1
key: key1
volumeMounts:
- name: config
mountPath: /etc/pipecd-config
readOnly: true
volumes:
- name: config
secret:
secretName: cronjob-secret-2
restartPolicy: OnFailure
`,
expected: []string{
"cronjob-secret-1",
"cronjob-secret-2",
},
},
}

for _, tc := range testcases {
Expand Down
Loading