diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-04 13:25:21 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-04 13:25:21 -0700 |
commit | 9929c67a7011027b1e9fc467d7ca0992a0329ab0 (patch) | |
tree | eab98ff0c970fd23698fb41dd0d6b7c9e945ad32 /roles/lib_openshift/library/oc_route.py | |
parent | b11783ab2a9fcb88067d631468e3750fcddc67b3 (diff) | |
parent | 7d8d21b7a5170fa3b187d7afe6d010a2e888fe74 (diff) | |
download | openshift-9929c67a7011027b1e9fc467d7ca0992a0329ab0.tar.gz openshift-9929c67a7011027b1e9fc467d7ca0992a0329ab0.tar.bz2 openshift-9929c67a7011027b1e9fc467d7ca0992a0329ab0.tar.xz openshift-9929c67a7011027b1e9fc467d7ca0992a0329ab0.zip |
Merge pull request #5314 from fabianvf/asb-config-update
Automatic merge from submit-queue.
Update broker configuration to track current broker
Broker configuration has been drifting from this installer, updated configuration and deployment methods a bit to make it work with the new upstream broker.
Note: This will not work well when deploying openshift-enterprise, to deploy openshift-enterprise you will need to use an older checkout of openshift-ansible, or specify the upstream broker + catalog and use a registry other than the RHCC. This is because the configuration for the current upstream broker is incompatible with the downstream broker.
Diffstat (limited to 'roles/lib_openshift/library/oc_route.py')
-rw-r--r-- | roles/lib_openshift/library/oc_route.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/roles/lib_openshift/library/oc_route.py b/roles/lib_openshift/library/oc_route.py index b46fd5495..e003770d8 100644 --- a/roles/lib_openshift/library/oc_route.py +++ b/roles/lib_openshift/library/oc_route.py @@ -90,6 +90,12 @@ options: required: false default: str aliases: [] + labels: + description: + - The labels to apply on the route + required: false + default: None + aliases: [] tls_termination: description: - The options for termination. e.g. reencrypt @@ -1469,6 +1475,7 @@ class RouteConfig(object): sname, namespace, kubeconfig, + labels=None, destcacert=None, cacert=None, cert=None, @@ -1483,6 +1490,7 @@ class RouteConfig(object): self.kubeconfig = kubeconfig self.name = sname self.namespace = namespace + self.labels = labels self.host = host self.tls_termination = tls_termination self.destcacert = destcacert @@ -1508,6 +1516,8 @@ class RouteConfig(object): self.data['metadata'] = {} self.data['metadata']['name'] = self.name self.data['metadata']['namespace'] = self.namespace + if self.labels: + self.data['metadata']['labels'] = self.labels self.data['spec'] = {} self.data['spec']['host'] = self.host @@ -1715,6 +1725,7 @@ class OCRoute(OpenShiftCLI): rconfig = RouteConfig(params['name'], params['namespace'], params['kubeconfig'], + params['labels'], files['destcacert']['value'], files['cacert']['value'], files['cert']['value'], @@ -1819,6 +1830,7 @@ def main(): state=dict(default='present', type='str', choices=['present', 'absent', 'list']), debug=dict(default=False, type='bool'), + labels=dict(default=None, type='dict'), name=dict(default=None, required=True, type='str'), namespace=dict(default=None, required=True, type='str'), tls_termination=dict(default=None, type='str'), |