Merge pull request #37 from stat-kwon/master

Add image_pull_secrets field in labels of plugin_info
cloudforet-io · Oct 25, 2023 · 79782f0 · 79782f0
2 parents 38f8fd3 + 43f17ce
commit 79782f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/spaceone/supervisor/connector/kubernetes_connector.py b/src/spaceone/supervisor/connector/kubernetes_connector.py
@@ -245,6 +245,9 @@ def _create_deployment(self, image, name, labels):
         if _image_pull_secrets := self.config.get('imagePullSecrets'):
             deployment['spec']['template']['spec']['imagePullSecrets'] = _image_pull_secrets
 
+        if _image_pull_secrets := labels.get('spaceone.supervisor.plugin.image_pull_secrets'):
+            deployment['spec']['template']['spec']['imagePullSecrets'] = [{"name": _image_pull_secrets}]
+
         if _volumes := self.config.get('volumes'):
             deployment['spec']['template']['spec']['volumes'] = _volumes
 

diff --git a/src/spaceone/supervisor/service/supervisor_service.py b/src/spaceone/supervisor/service/supervisor_service.py
@@ -254,6 +254,10 @@ def install_plugin(self, params):
             'spaceone.supervisor.plugin.version': params['version'],
             'spaceone.supervisor.plugin.service_type': plugin_info.service_type
         }
+
+        if image_pull_secrets := plugin_info.registry_config.get('image_pull_secrets'):
+            labels.update({'spaceone.supervisor.plugin.image_pull_secrets': image_pull_secrets})
+
         # Determine port mapping
         host_port = self._supervisor_mgr.find_host_port()
         _LOGGER.debug("Choose Host Port: %d" % host_port)