Skip to content

Commit 2fcd015

Browse files
committed
Change apiserver patch to strategic merge
1 parent 42ae939 commit 2fcd015

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

bundle/manifests/ibm-websphere-liberty.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ metadata:
6262
capabilities: Auto Pilot
6363
categories: Application Runtime
6464
containerImage: icr.io/cpopen/websphere-liberty-operator:daily
65-
createdAt: "2024-02-23T20:12:48Z"
65+
createdAt: "2024-04-23T15:07:30Z"
6666
description: Deploy and manage containerized Liberty applications
6767
olm.skipRange: '>=1.0.0 <1.3.1'
6868
operators.openshift.io/infrastructure-features: '["disconnected"]'

config/manifests/apiServerAccessPatch.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

config/manifests/kustomization.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ resources:
77
- ../scorecard
88
patchesStrategicMerge:
99
- patches/csvAnnotations.yaml
10+
- patches/apiServerAccessPatch.yaml
1011
patches:
1112
- path: serviceBindingPatch.yaml
1213
target:
@@ -23,11 +24,6 @@ patches:
2324
kind: ClusterServiceVersion
2425
name: ibm-websphere-liberty.v0.0.0
2526
namespace: placeholder
26-
- path: apiServerAccessPatch.yaml
27-
target:
28-
kind: ClusterServiceVersion
29-
name: ibm-websphere-liberty.v0.0.0
30-
namespace: placeholder
3127
# [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
3228
# Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.
3329
# These patches remove the unnecessary "cert" volume and its manager container volumeMount.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
apiVersion: operators.coreos.com/v1alpha1
2+
kind: ClusterServiceVersion
3+
metadata:
4+
name: ibm-websphere-liberty.v0.0.0
5+
namespace: placeholder
6+
spec:
7+
install:
8+
spec:
9+
deployments:
10+
- spec:
11+
template:
12+
metadata:
13+
labels:
14+
webspherelibertyapps.liberty.websphere.ibm.com/allow-apiserver-access: "true"

0 commit comments

Comments
 (0)