Commit e69fd47

committed

garbage collect only resources that belongs to the specific CR

1 parent d677b43 commit e69fd47Copy full SHA for e69fd47

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@ kind: Kustomization`
`13`	`13`	`images:`
`14`	`14`	`- name: controller`
`15`	`15`	`newName: itayankri/osrm-operator`
`16`		`- newTag: v1.5.0`
	`16`	`+ newTag: latest`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,9 @@ func (r *OSRMClusterReconciler) getChildResources(ctx context.Context, instance`
`449`	`449`
`450`	`450`	`func (r OSRMClusterReconciler) garbageCollection(ctx context.Context, instance osrmv1alpha1.OSRMCluster) error {`
`451`	`451`	`labelSelector := fmt.Sprintf(`
`452`		`- "%s in (%s),%s,%s notin (%d)",`
	`452`	`+ "%s in (%s),%s in (%s),%s,%s notin (%d)",`
	`453`	`+ metadata.NameLabelKey,`
	`454`	`+ instance.Name,`
`453`	`455`	`metadata.ComponentLabelKey,`
`454`	`456`	`metadata.ComponentLabelProfile,`
`455`	`457`	`metadata.GenerationLabelKey,`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ const (`
`14`	`14`	`ComponentLabelProfile ComponentLabelValue = "profile"`
`15`	`15`	`)`
`16`	`16`
`17`		`-const NameLabel = "app.kubernetes.io/name"`
	`17`	`+const NameLabelKey = "app.kubernetes.io/name"`
`18`	`18`	`const PartOfLabelKey = "app.kubernetes.io/part-of"`
`19`	`19`	`const ComponentLabelKey = "app.kubernetes.io/component"`
`20`	`20`	`const GenerationLabelKey = "osrmcluster.itayankri/cluster-generation"`
`21`	`21`
`22`	`22`	`func GetLabels(instance *osrmv1alpha1.OSRMCluster, componentName ComponentLabelValue) map[string]string {`
`23`	`23`	`labels := map[string]string{`
`24`		`- NameLabel: instance.Name,`
	`24`	`+ NameLabelKey: instance.Name,`
`25`	`25`	`PartOfLabelKey: "osrmcluster",`
`26`	`26`	`ComponentLabelKey: string(componentName),`
`27`	`27`	`GenerationLabelKey: strconv.FormatInt(instance.ObjectMeta.Generation, 10),`

Comments

(0)