diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml index c81ba473a..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 -resources: - - "../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 b2d64c5f9..d979cdfc9 100644 --- a/pkg/kustomize/kustomize.go +++ b/pkg/kustomize/kustomize.go @@ -439,8 +439,11 @@ 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") } - componentPaths = append(componentPaths, "../components/clairpgupgrade/base") } images := []types.Image{}