Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Allow retries on existing resources #32

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Bugfix: Allow retries on existing resources #32

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf30d71
Bugfix: Allow retries on existing resources
Tunguska55 Oct 9, 2023
2b23d47
adjusting compare_to and resource
Tunguska55 Oct 10, 2023
d8fbbda
adding more output to failure json
Tunguska55 Oct 10, 2023
de7ddb4
adding current_resource_version check
Tunguska55 Oct 10, 2023
5efe561
adding to fail_json
Tunguska55 Oct 10, 2023
f09ed16
adding print statements
Tunguska55 Oct 12, 2023
ba71943
conditional to check stdout
Tunguska55 Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions library/openshift_provision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,10 @@ def run_oc(self, args, **kwargs):
(rc, stdout, stderr) = self.module.run_command(self.oc_cmd + args, **kwargs)

if rc != 0 and check_rc:
self.module.fail_json(cmd=args, rc=rc, stdout=stdout, stderr=stderr, msg=stderr)
self.module.fail_json(
cmd=args, rc=rc, stdout=stdout, stderr=stderr, msg=stderr,
resource=self.resource, current_resource_version=self.current_resource_version
)

return (rc, stdout, stderr)

Expand All @@ -1120,6 +1123,8 @@ def get_current_resource(self):
if self.namespace:
command += ['-n', self.namespace]
(rc, stdout, stderr) = self.run_oc(command, check_rc=False)
if self.resource['kind'] == "CertManager" and self.resource['metadata']['name'] == "cluster":
print("Resource stdout: {}".format(stdout))
if rc != 0:
return None
resource = json.loads(stdout)
Expand Down Expand Up @@ -1386,30 +1391,19 @@ def get_resource_version_and_last_applied_configuration(self, resource):

metadata = resource.get('metadata', {})
resource_version = metadata \
.get('resourceVersion', None)
.pop('resourceVersion', None)
last_applied_configuration = metadata \
.get('annotations', {}) \
.get('kubectl.kubernetes.io/last-applied-configuration', None)
.pop('kubectl.kubernetes.io/last-applied-configuration', None)
return resource_version, last_applied_configuration

def set_resource_version_and_last_applied_configuration(self, resource_version, last_applied_configuration):
if not resource_version or not last_applied_configuration:
return
merge_dict(self.resource, {
'metadata': {
'annotations': {
'kubectl.kubernetes.io/last-applied-configuration': last_applied_configuration
},
'resourceVersion': resource_version
}
}, overwrite=True)

def provision(self):
current_resource = self.get_current_resource()
current_resource_version, current_last_applied_configuration = \
self.get_resource_version_and_last_applied_configuration(current_resource)
if current_resource and self.action in ['apply', 'replace']:
self.set_dynamic_values(current_resource)
self.current_resource_version = current_resource_version

# Check if changes are required and if we need to reset the apply metadata.
reset_last_applied_configuration = False
Expand Down Expand Up @@ -1495,17 +1489,19 @@ def provision(self):
command += ['-n', self.namespace]
self.run_oc(command, data=json.dumps(self.resource), check_rc=True)
else: # apply, create, delete, replace
if self.action == 'apply':
self.set_resource_version_and_last_applied_configuration(
current_resource_version,
current_last_applied_configuration
)
resource = copy.deepcopy(self.resource)
if self.action == 'apply' and current_resource_version:
merge_dict(resource, {
'metadata': {
'resourceVersion': current_resource_version
}
})
command = [self.action, '-f', '-']
if self.namespace:
command += ['-n', self.namespace]
if reset_last_applied_configuration:
command += ['--save-config']
self.run_oc(command, data=json.dumps(self.resource), check_rc=True)
self.run_oc(command, data=json.dumps(resource), check_rc=True)

def run_module():
module_args = {
Expand Down Expand Up @@ -1559,14 +1555,18 @@ def run_module():
msg=str(e),
action=provisioner.action,
traceback=traceback.format_exc().split('\n'),
resource=provisioner.resource
resource=provisioner.resource,
current_resource_version=str(provisioner.current_resource_version or None),
jontest="Jon Test"
)

module.exit_json(
action=provisioner.action,
changed=provisioner.changed,
patch=provisioner.patch,
resource=provisioner.resource
resource=provisioner.resource,
current_resource_version=str(provisioner.current_resource_version or None),
jontest="Jon Test"
)

def main():
Expand Down