mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 06:27:05 +00:00
Merge pull request #52663 from wwwtyro/rye/s390x-ingress-controller-support
Automatic merge from submit-queue (batch tested with PRs 50988, 50509, 52660, 52663, 52250). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. s390x ingress controller support **What this PR does / why we need it**: Adds support for an s390x ingress image to the juju kubernetes-worker charm. **Release note**: ``` Adds support for an s390x ingress image to the juju kubernetes-worker charm. ```
This commit is contained in:
commit
f25bb13a82
@ -567,6 +567,9 @@ def launch_default_ingress_controller():
|
||||
return
|
||||
|
||||
# Render the ingress replication controller manifest
|
||||
context['ingress_image'] = "gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.13"
|
||||
if arch() == 's390x':
|
||||
context['ingress_image'] = "docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13"
|
||||
manifest = addon_path.format('ingress-replication-controller.yaml')
|
||||
render('ingress-replication-controller.yaml', manifest, context)
|
||||
hookenv.log('Creating the ingress replication controller.')
|
||||
|
@ -24,7 +24,7 @@ spec:
|
||||
# see https://github.com/kubernetes/kubernetes/issues/23920
|
||||
hostNetwork: true
|
||||
containers:
|
||||
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
|
||||
- image: {{ ingress_image }}
|
||||
name: nginx-ingress-lb
|
||||
imagePullPolicy: Always
|
||||
livenessProbe:
|
||||
@ -50,4 +50,4 @@ spec:
|
||||
args:
|
||||
- /nginx-ingress-controller
|
||||
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend
|
||||
- --nginx-configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf
|
||||
- --configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf
|
||||
|
Loading…
Reference in New Issue
Block a user