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

Add bundle target for OpenShift #135

Merged
merged 1 commit into from
Jul 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ bundle: manifests kustomize ## Generate bundle manifests and metadata, then vali
bundle-build: ## Build the bundle image.
docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .

openshift-bundle-build: bundle ## Build the bundle image for OpenShift.
@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

.PHONY: bundle-push
bundle-push: ## Push the bundle image.
$(MAKE) docker-push IMG=$(BUNDLE_IMG)
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/k8s.nginx.org_nginxingresscontrollers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,10 @@ spec:
type: integer
secret:
description: A Secret with a TLS certificate and key for TLS termination
of the Prometheus endpoint. If the argument is set,
but the Ingress controller is not able to fetch the Secret from
Kubernetes API, the Ingress Controller will fail to start. Format
is namespace/name.
of the Prometheus endpoint. The secret must be of the type kubernetes.io/tls.
If specified, but the Ingress controller is not able to fetch
the Secret from Kubernetes API, the Ingress Controller will
fail to start. Format is namespace/name.
type: string
required:
- enable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -381,11 +381,11 @@ spec:
periodSeconds: 10
resources:
limits:
cpu: 100m
memory: 30Mi
cpu: 500m
memory: 128Mi
requests:
cpu: 100m
memory: 20Mi
cpu: 250m
memory: 64Mi
securityContext:
allowPrivilegeEscalation: false
securityContext:
Expand Down