Prefix nodepool specific resources with instance name
Similar to the zuul-specific resources, we want to have the nodepool resources maintain the same pattern. This also corrects an issue where the nodepool-launcher name for unused providers wouldn't match up to the pattern being used anyway. Change-Id: I653902d147386084b05764589e9db7d78c5a6495
This commit is contained in:
parent
667f2c4f48
commit
89ecb88fb8
|
@ -20,14 +20,14 @@
|
|||
command: timeout 10m kubectl rollout status statefulset/my-zuul-executor
|
||||
|
||||
- name: Wait 8 minutes for kube launcher to settle
|
||||
command: kubectl logs deployment/nodepool-launcher-kube-cluster
|
||||
command: kubectl logs deployment/my-nodepool-launcher-kube-cluster
|
||||
register: _launcher_log
|
||||
until: "'Starting PoolWorker' in _launcher_log.stdout"
|
||||
delay: 10
|
||||
retries: 48
|
||||
|
||||
- name: Wait 8 minutes for static launcher to settle
|
||||
command: kubectl logs deployment/nodepool-launcher-static-vms
|
||||
command: kubectl logs deployment/my-nodepool-launcher-static-vms
|
||||
register: _launcher_log
|
||||
until: "'Starting PoolWorker' in _launcher_log.stdout"
|
||||
delay: 10
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: nodepool-launcher-{{ provider_name }}
|
||||
name: {{ instance_name }}-nodepool-launcher-{{ provider_name }}
|
||||
labels:
|
||||
app.kubernetes.io/name: nodepool
|
||||
app.kubernetes.io/instance: {{ instance_name }}
|
||||
|
|
|
@ -257,6 +257,12 @@ class Zuul:
|
|||
ret.append(server)
|
||||
return ret
|
||||
|
||||
def _nodepool_conf_name(self, provider):
|
||||
return f"{self.name}-nodepool-config-{provider}"
|
||||
|
||||
def _nodepool_launcher_name(self, provider):
|
||||
return f"{self.name}-nodepool-launcher-{provider}"
|
||||
|
||||
def write_nodepool_conf(self):
|
||||
self.nodepool_provider_secrets = {}
|
||||
# load nodepool config
|
||||
|
@ -287,7 +293,7 @@ class Zuul:
|
|||
for provider in nodepool_yaml['providers']:
|
||||
self.log.info("Configuring provider %s", provider.get('name'))
|
||||
|
||||
secret_name = f"nodepool-config-{self.name}-{provider['name']}"
|
||||
secret_name = self._nodepool_conf_name(provider['name'])
|
||||
|
||||
provider_yaml = nodepool_yaml.copy()
|
||||
provider_yaml['providers'] = [provider]
|
||||
|
@ -329,9 +335,8 @@ class Zuul:
|
|||
for unused_provider in old_providers - new_providers:
|
||||
self.log.info("Deleting unused provider %s", unused_provider)
|
||||
|
||||
deployment_name = "nodepool-launcher-"\
|
||||
f"{self.name}-{unused_provider}"
|
||||
secret_name = f"nodepool-config-{self.name}-{unused_provider}"
|
||||
deployment_name = self._nodepool_launcher_name(unused_provider)
|
||||
secret_name = self._nodepool_config_name(unused_provider)
|
||||
|
||||
try:
|
||||
obj = objects.Deployment.objects(self.api).filter(
|
||||
|
|
Loading…
Reference in New Issue