Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌱 Bump ingress-nginx in prow to v1.10.4 #857

Merged
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
2 changes: 1 addition & 1 deletion prow/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ Now you are ready to create the files.

For accessing an existing instance, you can simply get the relevant credentials
and files from the password manager and put them in the correct places (see the
section for generating secret files). Check the IP of the bastion in cleura and
section for generating secret files). Check the IP of the bastion in xerces and
set it in the environment variable `BASTION_FLOATING_IP`. After this you just
need to set up a proxy for accessing the API through the bastion:

Expand Down
2 changes: 1 addition & 1 deletion prow/infra/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- https://github.com/kubernetes/ingress-nginx/deploy/static/provider/cloud?ref=controller-v1.10.1
- https://github.com/kubernetes/ingress-nginx/deploy/static/provider/cloud?ref=controller-v1.10.4
- cluster-issuer-http.yaml
- storageclass.yaml
- ingress-controller-pdb.yaml
Expand Down
8 changes: 5 additions & 3 deletions prow/manifests/overlays/metal3/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ resources:
- pdb.yaml
- limitrange.yaml

commonLabels:
app.kubernetes.io/instance: metal3
app.kubernetes.io/part-of: prow

# For some of the configmaps and secrets we could use suffix hash,
# but some will be used directly by prow, which cannot know about
Expand Down Expand Up @@ -93,3 +90,8 @@ patches:
- path: toleration-node-selector-patch.yaml
target:
kind: Deployment
labels:
- includeSelectors: true
pairs:
app.kubernetes.io/instance: metal3
app.kubernetes.io/part-of: prow
Loading