Skip to content

Commit

Permalink
Fix missing kopf import (#149)
Browse files Browse the repository at this point in the history
* Fix issues detected by pylint

* Switch missing var secret to warning
  • Loading branch information
jkupferer authored Nov 29, 2022
1 parent 65a9af1 commit 7f35735
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 24 deletions.
6 changes: 3 additions & 3 deletions api/varsecret.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import json
import kubernetes_asyncio
import logging

from base64 import b64decode
from copy import deepcopy
Expand Down Expand Up @@ -68,9 +69,8 @@ async def get_vars(self):
deep_merge(ret, secret_data)
except kubernetes_asyncio.client.rest.ApiException as e:
if e.status == 404:
raise kopf.TemporaryError(
f"{self} missing var sercret {var_secret.name} in namespace {var_secret.namespace}",
delay = 60,
logging.warning(
f"{self} missing var sercret {var_secret.name} in namespace {var_secret.namespace}"
)
else:
raise
Expand Down
5 changes: 2 additions & 3 deletions operator/anarchyaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,7 @@ async def manage(self, anarchy_subject):
"""
if self.is_finished:
return await self.manage_finished(anarchy_subject)
else:
return await self.manage_active(anarchy_subject)
return await self.manage_active(anarchy_subject)

async def manage_active(self, anarchy_subject):
await anarchy_subject.add_action_to_status(self)
Expand All @@ -295,7 +294,7 @@ async def manage_active(self, anarchy_subject):
if seconds_to_start <= 0:
await self.check_start()
return 1
elif seconds_to_start < Anarchy.action_check_interval:
if seconds_to_start < Anarchy.action_check_interval:
return seconds_to_start

return Anarchy.action_check_interval
Expand Down
3 changes: 1 addition & 2 deletions operator/anarchycachedkopfobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ async def get(cls, name):
def load(cls, definition=None, **kwargs):
if definition:
return cls.load_definition(definition)
else:
return cls.load_kopf_object(**kwargs)
return cls.load_kopf_object(**kwargs)

@classmethod
def load_definition(cls, definition):
Expand Down
4 changes: 2 additions & 2 deletions operator/anarchygovernor.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ def ansible_galaxy_requirements(self):
return self.spec.get('ansibleGalaxyRequirements', [])

@property
def apiVersion(self):
return self.definition['apiVersion']
def api_version(self):
return self.definition['api_version']

@property
def has_create_handler(self):
Expand Down
11 changes: 3 additions & 8 deletions operator/anarchysubject.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@ def has_active_action(self):
"""
return True if self.status.get('activeAction') else False

@property
def has_active_action(self):
return 'activeAction' in self.status

@property
def has_active_runs(self):
return len(self.active_runs) > 0
Expand Down Expand Up @@ -476,7 +472,7 @@ async def manage_status(self):
except kubernetes_asyncio.client.rest.ApiException as e:
if e.status == 404:
logging.warning(f"Removing missing active AnarchyAction {self.active_action_name} from {self}")
patch.apppend({
patch.append({
"op": "remove",
"path": f"/status/activeAction",
})
Expand Down Expand Up @@ -521,7 +517,7 @@ async def manage_status(self):
remove_run = True
except kubernetes_asyncio.client.rest.ApiException as e:
if e.status == 404:
removeRun = True
remove_run = True
logging.warning(f"Removing missing AnarchyRun {run_name} from {self}")
else:
raise
Expand Down Expand Up @@ -632,8 +628,7 @@ async def remove_queued_run_from_status(self, anarchy_run):
except kubernetes_asyncio.client.rest.ApiException as e:
if e.status == 404:
return
else:
raise
raise

async def remove_finalizers(self):
await self.merge_patch({
Expand Down
10 changes: 4 additions & 6 deletions operator/operator.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import kubernetes_asyncio
import logging

from datetime import datetime, timezone

from anarchy import Anarchy
from anarchygovernor import AnarchyGovernor
from anarchysubject import AnarchySubject
Expand Down Expand Up @@ -43,7 +41,7 @@ async def on_startup(settings: kopf.OperatorSettings, logger, **_):

@kopf.on.cleanup()
async def on_cleanup():
await AnarchyRuntime.on_cleanup()
await Anarchy.on_cleanup()

@kopf.on.event(Anarchy.domain, Anarchy.version, 'anarchygovernors')
async def governor_event(event, logger, **_):
Expand All @@ -66,7 +64,7 @@ async def subject_delete(**kwargs):
async def subject_resume(meta, name, **kwargs):
if 'deletionTimestamp' in meta \
and Anarchy.domain not in meta['finalizers'] \
and Anarchy.deleting_label not in meta['finalizers']:
and Anarchy.subject_label not in meta['finalizers']:
logging.info(f"Ignoring functionally deleted AnarchySubject {name} on resume")
return

Expand Down Expand Up @@ -106,7 +104,7 @@ async def subject_event(event, **_):
await anarchy_subject.handle_post_delete_event()
else:
logging.error(
f"AnarchySubject {name} does not have {anarchy.domain} label "
f"AnarchySubject {name} does not have {Anarchy.domain} label "
f"but does have {Anarchy.subject_label} but is not deleting?"
)
else:
Expand Down Expand Up @@ -324,7 +322,7 @@ async def runner_update(**kwargs):
await anarchy_runner.handle_update()

@kopf.on.event('pods', labels={Anarchy.runner_label: kopf.PRESENT})
async def runner_pod_event(event, logger, **kwargs):
async def runner_pod_event(event, logger, **_):
obj = event.get('object')
if not obj or obj.get('kind') != 'Pod':
logging.warning(f"Weird event {event}")
Expand Down

0 comments on commit 7f35735

Please sign in to comment.