Skip to content
This repository was archived by the owner on May 24, 2023. It is now read-only.

Commit d1336db

Browse files
authored
Add bundle target for OpenShift (#135)
1 parent 542e296 commit d1336db

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ bundle: manifests kustomize ## Generate bundle manifests and metadata, then vali
167167
bundle-build: ## Build the bundle image.
168168
docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
169169

170+
openshift-bundle-build: bundle ## Build the bundle image for OpenShift.
171+
@printf "%s\n" '' 'LABEL com.redhat.openshift.versions="v4.6"' 'LABEL com.redhat.delivery.operator.bundle=true' 'LABEL com.redhat.delivery.backport=true' >> bundle.Dockerfile
172+
170173
.PHONY: bundle-push
171174
bundle-push: ## Push the bundle image.
172175
$(MAKE) docker-push IMG=$(BUNDLE_IMG)

bundle/manifests/k8s.nginx.org_nginxingresscontrollers.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ spec:
197197
type: integer
198198
secret:
199199
description: A Secret with a TLS certificate and key for TLS termination
200-
of the Prometheus endpoint. If the argument is set,
201-
but the Ingress controller is not able to fetch the Secret from
202-
Kubernetes API, the Ingress Controller will fail to start. Format
203-
is namespace/name.
200+
of the Prometheus endpoint. The secret must be of the type kubernetes.io/tls.
201+
If specified, but the Ingress controller is not able to fetch
202+
the Secret from Kubernetes API, the Ingress Controller will
203+
fail to start. Format is namespace/name.
204204
type: string
205205
required:
206206
- enable

bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -381,11 +381,11 @@ spec:
381381
periodSeconds: 10
382382
resources:
383383
limits:
384-
cpu: 100m
385-
memory: 30Mi
384+
cpu: 500m
385+
memory: 128Mi
386386
requests:
387-
cpu: 100m
388-
memory: 20Mi
387+
cpu: 250m
388+
memory: 64Mi
389389
securityContext:
390390
allowPrivilegeEscalation: false
391391
securityContext:

0 commit comments

Comments
 (0)