Skip to content
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
6 changes: 3 additions & 3 deletions build/scripts/generate_deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,15 @@ fi

# Run kustomize to build yamls
echo "Generating config for Kubernetes"
export RBAC_PROXY_IMAGE="${KUBE_RBAC_PROXY_IMAGE:-gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1}"
export RBAC_PROXY_IMAGE="${KUBE_RBAC_PROXY_IMAGE:-quay.io/brancz/kube-rbac-proxy:v0.13.1}"
${KUSTOMIZE} build "${DEPLOY_DIR}/templates/cert-manager" \
| envsubst "$SUBST_VARS" \
> "${KUBERNETES_DIR}/${COMBINED_FILENAME}"
unset RBAC_PROXY_IMAGE
echo "File saved to ${KUBERNETES_DIR}/${COMBINED_FILENAME}"

echo "Generating config for OpenShift"
export RBAC_PROXY_IMAGE="${OPENSHIFT_RBAC_PROXY_IMAGE:-gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1}"
export RBAC_PROXY_IMAGE="${OPENSHIFT_RBAC_PROXY_IMAGE:-quay.io/brancz/kube-rbac-proxy:v0.13.1}"
${KUSTOMIZE} build "${DEPLOY_DIR}/templates/service-ca" \
| envsubst "$SUBST_VARS" \
> "${OPENSHIFT_DIR}/${COMBINED_FILENAME}"
Expand All @@ -194,7 +194,7 @@ echo "File saved to ${OPENSHIFT_DIR}/${COMBINED_FILENAME}"

if $GEN_OLM; then
echo "Generating base deployment files for OLM"
export RBAC_PROXY_IMAGE="${OPENSHIFT_RBAC_PROXY_IMAGE:-gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1}"
export RBAC_PROXY_IMAGE="${OPENSHIFT_RBAC_PROXY_IMAGE:-quay.io/brancz/kube-rbac-proxy:v0.13.1}"
export NAMESPACE=openshift-operators
# Generate .spec.relatedImages for CSV based on deployment
TMPCSV="csv.tmp.yaml"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions deploy/deployment/kubernetes/combined.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions deploy/deployment/openshift/combined.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
relatedImages:
- image: quay.io/devfile/devworkspace-controller:next
name: devworkspace_webhook_server
- image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
- image: quay.io/brancz/kube-rbac-proxy:v0.13.1
name: kube_rbac_proxy
- image: quay.io/devfile/project-clone:next
name: project_clone
Expand Down
Loading