Commit 409b41d

committed

wip

1 parent 1c88e2f commit 409b41dCopy full SHA for 409b41d

File tree

+20

-14

lines changed

+20

-14

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -443,6 +443,18 @@ func (r *OSRMClusterReconciler) getChildResources(ctx context.Context, instance`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`func (r OSRMClusterReconciler) garbageCollection(ctx context.Context, instance osrmv1alpha1.OSRMCluster) error {`
	`446`	`+ cronJobs := &batchv1.CronJobList{}`
	`447`	`+ err := r.Client.List(ctx, cronJobs, &client.ListOptions{`
	`448`	`+ Namespace: instance.Namespace,`
	`449`	`+ LabelSelector: client.MatchingLabelsSelector{},`
	`450`	`+ })`
	`451`	`+`
	`452`	`+ jobs := &batchv1.JobList{}`
	`453`	`+ horizontalPodAutoscalers := &autoscalingv1.HorizontalPodAutoscalerList{}`
	`454`	`+ podDisruptionBudgets := &policyv1.PodDisruptionBudgetList{}`
	`455`	`+ services := &corev1.ServiceList{}`
	`456`	`+ deployments := &appsv1.DeploymentList{}`
	`457`	`+ persistentVolumeClaims := &corev1.PersistentVolumeClaimList{}`
`446`	`458`
`447`	`459`	`return nil`
`448`	`460`	`}`

Lines changed: 8 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -331,23 +331,17 @@ var _ = Describe("OSRMClusterController", func() {`
`331`	`331`	`})`
`332`	`332`
`333`	`333`	`It("Should delete all child resources that has a different generation than the custom resource", func() {`
`334`		`- firstGenerationProfileResources := getProfileResources(ctx, instance.Spec.Profiles[0])`
	`334`	`+ firstGenerationProfile := instance.Spec.Profiles[0]`
`335`	`335`
`336`	`336`	`Expect(updateWithRetry(instance, func(v *osrmv1alpha1.OSRMCluster) {`
`337`		`- v.Spec.Profiles[0].Name = "foot"`
	`337`	`+ v.Spec.Profiles[0] = &osrmv1alpha1.ProfileSpec{`
	`338`	`+ Name: "foot",`
	`339`	`+ EndpointName: firstGenerationProfile.EndpointName,`
	`340`	`+ MinReplicas: firstGenerationProfile.MinReplicas,`
	`341`	`+ MaxReplicas: firstGenerationProfile.MaxReplicas,`
	`342`	`+ Resources: firstGenerationProfile.Resources,`
	`343`	`+ }`
`338`	`344`	`})).To(Succeed())`
`339`		`-`
`340`		`- secondGenerationChildResources := getProfileResources(ctx, instance.Spec.Profiles[0])`
`341`		`-`
`342`		`- currentResourcesDict := map[string]bool{}`
`343`		`-`
`344`		`- for _, resource := range secondGenerationChildResources {`
`345`		`- currentResourcesDict[resource.GetName()] = true`
`346`		`- }`
`347`		`-`
`348`		`- for _, resource := range firstGenerationProfileResources {`
`349`		`- Expect(currentResourcesDict[resource.GetName()]).ToNot(BeTrue())`
`350`		`- }`
`351`	`345`	`})`
`352`	`346`	`})`
`353`	`347`	`})`

Comments

(0)