Skip to content

Commit

Permalink
Merge branch 'main' into chore/add-image-pull-secret-name-to-makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
j1m-ryan committed Aug 13, 2024
2 parents 6e2f0e8 + 3a987f5 commit 59b679e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ uninstall: kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube
.PHONY: deploy
deploy: kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
cd config/default && $(KUSTOMIZE) edit set image kube-rbac-proxy=$(KRP_IMAGE_BASE):$(KRP_IMAGE_TAG)
if [ -n "$(IMAGE_PULL_SECRET_NAME)" ]; then cd config/default && $(KUSTOMIZE) edit add patch --kind Deployment --group apps --version v1 --name controller-manager --patch '${patch}'; fi
$(KUSTOMIZE) build config/default | kubectl apply -f -

Expand Down
20 changes: 20 additions & 0 deletions docs/manual-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,23 @@ Alternatively, to create an SCC for NIC daemonsets, please run this command:
You can now deploy the NGINX Ingress Controller instances.

**Note: If you're upgrading your operator installation to a later release, navigate [here](../helm-charts/nginx-ingress/) and run `kubectl apply -f crds/` or `oc apply -f crds/` as a prerequisite**
## Private Registry
You can use the operator (including the kube-rbac-proxy) images from your own private registry.
1. Tag the images for your private registry
```shell
docker tag quay.io/nginx/nginx-ingress-operator:2.3.1 <my-private-registry>/nginx-ingress-operator:2.3.1
docker tag quay.io/brancz/kube-rbac-proxy:v0.18.0 <my-private-registry>/kube-rbac-proxy:v0.18.0
```
2. Push the image to your private registry
```shell
docker push <my-private-registry>/nginx-ingress-operator:2.3.1
docker push <my-private-registry>/kube-rbac-proxy:v0.18.0
```
3. Follow step 1 above but in step 1.2 you can run
```shell
make deploy IMG=<my-private-registry>/nginx-ingress-operator:2.3.1 KRP_IMAGE_BASE=<my-private-registry>/kube-rbac-proxy
```
**Note: If you need to use a different `kube-rbac-proxy` version than the default, use the `KRP_IMAGE_TAG` variable**

0 comments on commit 59b679e

Please sign in to comment.