vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert to old secret handling, fix license loading

Browse source
This commit is contained in:
Evan Cordell 2017-06-28 23:15:14 -04:00
parent ef459a2d18
commit d64b8b1fcf
2 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
util/config/provider/k8sprovider.py
View file

@ -57,9 +57,9 @@ class KubernetesConfigProvider(FileConfigProvider):
def volume_file_exists(self, filename):
secret = self._lookup_secret()
if not secret:
if not secret or not secret.get('data'):
return False
return filename in secret
return filename in secret['data']
def list_volume_directory(self, path):
@ -69,7 +69,7 @@ class KubernetesConfigProvider(FileConfigProvider):
return []
paths = []
for filename in secret:
for filename in secret.get('data', {}):
if filename.startswith(path):
paths.append(filename[len(path) + 1:])
return paths
@ -132,10 +132,7 @@ class KubernetesConfigProvider(FileConfigProvider):
response = self._execute_k8s_api('GET', secret_url)
if response.status_code != 200:
return None
secret_resp = json.loads(response.text)
if "data" not in secret_resp:
return secret_resp
return secret_resp["data"]
return json.loads(response.text)
def _execute_k8s_api(self, method, relative_url, data=None):
headers = {