Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Commit

Permalink
Fix: patchesStrategicMerge is deprecated use patches
Browse files Browse the repository at this point in the history
The `patchesStrategicMerge` field is no longer supported and has been replaced with the `patches`
field in the Kustomization file.

Signed-off-by: Gloria Ciavarrini <gciavarrini@redhat.com>
  • Loading branch information
gciavarrini authored and openshift-merge-robot committed Jun 20, 2023
1 parent c63c677 commit f2bb45f
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 21 deletions.
7 changes: 4 additions & 3 deletions hack/manifests/testing/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ resources:
- postgres.yaml
- ../base

patchesStrategicMerge:
- parodos-patch.yaml
patches:
- path: parodos-patch-workflow-service.yaml
- path: parodos-patch-workflow-service-config.yaml
- path: parodos-patch-notification-service-config.yaml

images:
- name: quay.io/parodos-dev/workflow-service:main
newTag: test

- name: quay.io/parodos-dev/notification-service:main
newTag: test

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: notification-service-config
data:
SPRING_PROFILES_ACTIVE: "local"
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: workflow-service
spec:
template:
spec:
containers:
- name: workflow-service
imagePullPolicy: IfNotPresent
---
apiVersion: v1
kind: ConfigMap
metadata:
Expand All @@ -20,10 +9,3 @@ data:
DATASOURCE_PASSWORD: "parodos"
SPRING_PROFILES_ACTIVE: "dev"
NOTIFICATION_SERVER_URL: "http://notification-service.default.svc.cluster.local:8080"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: notification-service-config
data:
SPRING_PROFILES_ACTIVE: "local"
10 changes: 10 additions & 0 deletions hack/manifests/testing/parodos-patch-workflow-service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: workflow-service
spec:
template:
spec:
containers:
- name: workflow-service
imagePullPolicy: IfNotPresent

0 comments on commit f2bb45f

Please sign in to comment.