From 798b6f7c42c41053fc3308b409242d0fc862007c Mon Sep 17 00:00:00 2001 From: Shubhra Deshpande Date: Tue, 1 Oct 2024 16:54:06 -0400 Subject: [PATCH 1/5] fix: fixing recursed accumulation of path for managed clair resources --- .../clairpgupgrade/scale-down-clair/kustomization.yaml | 4 ++-- pkg/kustomize/kustomize.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml index c81ba473a..2c1e46073 100644 --- a/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml +++ b/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml @@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component patchesStrategicMerge: - ./clair.deployment.patch.yaml -resources: - - "../base" +components: + - ../base diff --git a/pkg/kustomize/kustomize.go b/pkg/kustomize/kustomize.go index b2d64c5f9..b72e63ced 100644 --- a/pkg/kustomize/kustomize.go +++ b/pkg/kustomize/kustomize.go @@ -439,8 +439,9 @@ func KustomizationFor( if ctx.NeedsClairPgUpgrade { if v1.ComponentIsManaged(quay.Spec.Components, v1.ComponentClair) { componentPaths = append(componentPaths, "../components/clairpgupgrade/scale-down-clair") + } else { + componentPaths = append(componentPaths, "../components/clairpgupgrade/base") } - componentPaths = append(componentPaths, "../components/clairpgupgrade/base") } images := []types.Image{} From 5798f0c9e6df90ffc9720eb50e3d73346b9ec659 Mon Sep 17 00:00:00 2001 From: Shubhra Deshpande Date: Thu, 3 Oct 2024 14:24:27 -0400 Subject: [PATCH 2/5] rev: added scale up clair for managed component --- .../clairpgupgrade/scale-down-clair/kustomization.yaml | 3 +-- .../scale-up-clair/clair.deployment.patch.yaml | 7 +++++++ .../clairpgupgrade/scale-up-clair/kustomization.yaml | 5 +++++ pkg/kustomize/kustomize.go | 2 ++ 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 kustomize/components/clairpgupgrade/scale-up-clair/clair.deployment.patch.yaml create mode 100644 kustomize/components/clairpgupgrade/scale-up-clair/kustomization.yaml diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml index 2c1e46073..48c56906f 100644 --- a/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml +++ b/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component patchesStrategicMerge: - ./clair.deployment.patch.yaml -components: - - ../base + diff --git a/kustomize/components/clairpgupgrade/scale-up-clair/clair.deployment.patch.yaml b/kustomize/components/clairpgupgrade/scale-up-clair/clair.deployment.patch.yaml new file mode 100644 index 000000000..f52a157e0 --- /dev/null +++ b/kustomize/components/clairpgupgrade/scale-up-clair/clair.deployment.patch.yaml @@ -0,0 +1,7 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: clair-app + +spec: + replicas: 2 diff --git a/kustomize/components/clairpgupgrade/scale-up-clair/kustomization.yaml b/kustomize/components/clairpgupgrade/scale-up-clair/kustomization.yaml new file mode 100644 index 000000000..48c56906f --- /dev/null +++ b/kustomize/components/clairpgupgrade/scale-up-clair/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +patchesStrategicMerge: + - ./clair.deployment.patch.yaml + diff --git a/pkg/kustomize/kustomize.go b/pkg/kustomize/kustomize.go index b72e63ced..d979cdfc9 100644 --- a/pkg/kustomize/kustomize.go +++ b/pkg/kustomize/kustomize.go @@ -439,6 +439,8 @@ func KustomizationFor( if ctx.NeedsClairPgUpgrade { if v1.ComponentIsManaged(quay.Spec.Components, v1.ComponentClair) { componentPaths = append(componentPaths, "../components/clairpgupgrade/scale-down-clair") + componentPaths = append(componentPaths, "../components/clairpgupgrade/base") + componentPaths = append(componentPaths, "../components/clairpgupgrade/scale-up-clair") } else { componentPaths = append(componentPaths, "../components/clairpgupgrade/base") } From 8272ba9f20fa4243c4bb05c9a0393feb45241ae2 Mon Sep 17 00:00:00 2001 From: Shubhra Deshpande Date: Fri, 4 Oct 2024 18:30:21 -0400 Subject: [PATCH 3/5] rev:added scale up component for postgres and clair resource --- .../scale-down-clair/clair-pg-scale-up.patch.yaml | 6 ++++++ .../scale-down-clair/clair.deployment-scale-up.patch.yaml | 6 ++++++ .../clairpgupgrade/scale-down-clair/kustomization.yaml | 5 ++++- pkg/kustomize/kustomize.go | 2 -- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 kustomize/components/clairpgupgrade/scale-down-clair/clair-pg-scale-up.patch.yaml create mode 100644 kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/clair-pg-scale-up.patch.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/clair-pg-scale-up.patch.yaml new file mode 100644 index 000000000..875b1827f --- /dev/null +++ b/kustomize/components/clairpgupgrade/scale-down-clair/clair-pg-scale-up.patch.yaml @@ -0,0 +1,6 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: clair-app +spec: + replicas: 2 diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml new file mode 100644 index 000000000..25835358e --- /dev/null +++ b/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml @@ -0,0 +1,6 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: clair-postgres +spec: + replicas: 2 \ No newline at end of file diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml index 48c56906f..52e98776d 100644 --- a/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml +++ b/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml @@ -2,4 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component patchesStrategicMerge: - ./clair.deployment.patch.yaml - + - ./clair-pg-scale-up.patch.yaml + - ./clair.deployment-scale-up.patch.yaml +components: + - ../base diff --git a/pkg/kustomize/kustomize.go b/pkg/kustomize/kustomize.go index d979cdfc9..b72e63ced 100644 --- a/pkg/kustomize/kustomize.go +++ b/pkg/kustomize/kustomize.go @@ -439,8 +439,6 @@ func KustomizationFor( if ctx.NeedsClairPgUpgrade { if v1.ComponentIsManaged(quay.Spec.Components, v1.ComponentClair) { componentPaths = append(componentPaths, "../components/clairpgupgrade/scale-down-clair") - componentPaths = append(componentPaths, "../components/clairpgupgrade/base") - componentPaths = append(componentPaths, "../components/clairpgupgrade/scale-up-clair") } else { componentPaths = append(componentPaths, "../components/clairpgupgrade/base") } From 97e616daf49c1c79204f556bb0ee49f3fc888818 Mon Sep 17 00:00:00 2001 From: Shubhra Deshpande Date: Fri, 4 Oct 2024 18:35:17 -0400 Subject: [PATCH 4/5] rev: removed scale up folder --- .../scale-down-clair/clair.deployment-scale-up.patch.yaml | 3 ++- .../scale-up-clair/clair.deployment.patch.yaml | 7 ------- .../clairpgupgrade/scale-up-clair/kustomization.yaml | 5 ----- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 kustomize/components/clairpgupgrade/scale-up-clair/clair.deployment.patch.yaml delete mode 100644 kustomize/components/clairpgupgrade/scale-up-clair/kustomization.yaml diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml index 25835358e..115c24be9 100644 --- a/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml +++ b/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml @@ -3,4 +3,5 @@ kind: Deployment metadata: name: clair-postgres spec: - replicas: 2 \ No newline at end of file + replicas: 2 + \ No newline at end of file diff --git a/kustomize/components/clairpgupgrade/scale-up-clair/clair.deployment.patch.yaml b/kustomize/components/clairpgupgrade/scale-up-clair/clair.deployment.patch.yaml deleted file mode 100644 index f52a157e0..000000000 --- a/kustomize/components/clairpgupgrade/scale-up-clair/clair.deployment.patch.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: clair-app - -spec: - replicas: 2 diff --git a/kustomize/components/clairpgupgrade/scale-up-clair/kustomization.yaml b/kustomize/components/clairpgupgrade/scale-up-clair/kustomization.yaml deleted file mode 100644 index 48c56906f..000000000 --- a/kustomize/components/clairpgupgrade/scale-up-clair/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1alpha1 -kind: Component -patchesStrategicMerge: - - ./clair.deployment.patch.yaml - From da3127aef72067d6937505cd65eeccf6ff2cc7c9 Mon Sep 17 00:00:00 2001 From: Shubhra Deshpande Date: Mon, 7 Oct 2024 11:26:18 -0400 Subject: [PATCH 5/5] minor: fixed lint --- .../scale-down-clair/clair.deployment-scale-up.patch.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml index 115c24be9..25835358e 100644 --- a/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml +++ b/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml @@ -3,5 +3,4 @@ kind: Deployment metadata: name: clair-postgres spec: - replicas: 2 - \ No newline at end of file + replicas: 2 \ No newline at end of file