Skip to content

Commit

Permalink
Merge pull request #131 from europeana/EA-3638_patchesFix
Browse files Browse the repository at this point in the history
EA-3638 replace patchesStrategicMerge with patches
  • Loading branch information
P-Ehlert authored Mar 25, 2024
2 parents 329f11e + f4ee9a5 commit 07afa98
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions k8s/overlays/cloud/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ resources:
- hpa.yaml
- cronjob.yaml

patchesStrategicMerge:
- deployment_patch.yaml
patches:
- path: deployment_patch.yaml

configMapGenerator:
- name: fulltext-annosync-config
Expand Down
4 changes: 2 additions & 2 deletions k8s/overlays/dev/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ resources:
# uncomment to run annosync cronjob
# - cronjob.yaml

patchesStrategicMerge:
- deployment_patch.yaml
patches:
- path: deployment_patch.yaml

commonLabels:
app: fulltext-api
Expand Down

0 comments on commit 07afa98

Please sign in to comment.