Skip to content

Commit

Permalink
codflare-operator manifests kustomize v5 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
oksanabaza committed Aug 21, 2024
1 parent f31a77d commit ee7e9b2
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ GH_CLI ?= $(LOCALBIN)/gh
SED ?= /usr/bin/sed

## Tool Versions
KUSTOMIZE_VERSION ?= v4.5.4
KUSTOMIZE_VERSION ?= v5.4.3
CODEGEN_VERSION ?= v0.27.2
CONTROLLER_TOOLS_VERSION ?= v0.9.2
YQ_VERSION ?= v4.35.2 ## latest version that works with go1.20
Expand Down
16 changes: 9 additions & 7 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,22 @@ namespace: openshift-operators
namePrefix: codeflare-operator-

# Labels to add to all resources and selectors.
commonLabels:
app.kubernetes.io/name: codeflare-operator
app.kubernetes.io/part-of: codeflare

bases:
labels:
- pairs:
app.kubernetes.io/name: codeflare-operator
app.kubernetes.io/part-of: codeflare
includeSelectors: true
resources:
- ../crd
- ../rbac
- ../manager
- ../webhook
- metrics_service.yaml
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
# - ../prometheus

resources:
- metrics_service.yaml
# resources:
# - metrics_service.yaml

patches:
- path: manager_webhook_patch.yaml
2 changes: 1 addition & 1 deletion config/e2e/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace: openshift-operators

bases:
resources:
- config.yaml
- ../default

Expand Down
16 changes: 10 additions & 6 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ configMapGenerator:
configurations:
- params.yaml

vars:
- name: codeflare_operator_controller_image
objref:
replacements:
- source:
kind: ConfigMap
name: stack-config
apiVersion: v1
fieldref:
fieldpath: data.codeflare-operator-controller-image
version: v1
fieldPath: data.codeflare-operator-controller-image
targets:
- select:
kind: Deployment
name: manager
fieldPaths:
- spec.template.spec.containers.0.image
4 changes: 2 additions & 2 deletions config/scorecard/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resources:
- bases/config.yaml
patchesJson6902:
patches:
- path: patches/basic.config.yaml
target:
group: scorecard.operatorframework.io
Expand All @@ -13,4 +13,4 @@ patchesJson6902:
version: v1alpha3
kind: Configuration
name: config
#+kubebuilder:scaffold:patchesJson6902
#+kubebuilder:scaffold:patches

0 comments on commit ee7e9b2

Please sign in to comment.