Skip to content

Commit b4b8048

Browse files
committed
Review changes: altered e2e Kustomization and changed default env to manifests
1 parent 5b2e182 commit b4b8048

File tree

6 files changed

+31
-2
lines changed

6 files changed

+31
-2
lines changed

.github/workflows/tag-and-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ jobs:
104104
- name: Update image version in params.env
105105
run: |
106106
VERSION=${{ github.event.inputs.version }} perl -i -pe 's/:(.*)$/:$ENV{"VERSION"}/' config/manifests/bases/params.env
107+
VERSION=${{ github.event.inputs.version }} perl -i -pe 's/:(.*)$/:$ENV{"VERSION"}/' config/e2e/params.env
107108
shell: bash
108109

109110
- name: Login to Quay.io

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ENVTEST_K8S_VERSION = 1.24.2
8383

8484
# The target deployment environment, that corresponds to the Kustomize directory
8585
# used to build the manifests.
86-
ENV ?= default
86+
ENV ?= manifests
8787

8888
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
8989
ifeq (,$(shell go env GOBIN))

config/e2e/kustomization.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
bases:
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
configMapGenerator:
5+
- name: codeflare-stack-config
6+
envs:
7+
- params.env
8+
configurations:
9+
- params.yaml
10+
11+
vars:
12+
- name: odh_codeflare_operator_controller_image
13+
objref:
14+
kind: ConfigMap
15+
name: codeflare-stack-config
16+
apiVersion: v1
17+
fieldref:
18+
fieldpath: data.odh-codeflare-operator-controller-image
19+
resources:
220
- ../default
321

422
patches:

config/e2e/params.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
odh-codeflare-operator-controller-image=quay.io/project-codeflare/codeflare-operator:v1.0.0

config/e2e/params.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
varReference:
2+
- path: spec/template/spec/containers[]/image
3+
kind: Deployment

config/manager/kustomization.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@ resources:
33

44
generatorOptions:
55
disableNameSuffixHash: true
6+
apiVersion: kustomize.config.k8s.io/v1beta1
7+
kind: Kustomization
8+
images:
9+
- name: controller
10+
newName: quay.io/project-codeflare/codeflare-operator
11+
newTag: v0.0.0-dev

0 commit comments

Comments
 (0)