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

[Dapr] Do not apply CRD hook when version is unchanged or auto-upgrade is being disabled #201

Merged
merged 5 commits into from
Dec 16, 2022
Merged

[Dapr] Do not apply CRD hook when version is unchanged or auto-upgrade is being disabled #201

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2bf657
Update logic
shubham1172 Nov 29, 2022
a993316
re-trigger pipeline
shubham1172 Nov 29, 2022
d417d93
re-trigger pipeline
shubham1172 Nov 30, 2022
412f4b7
Merge branch 'k8s-extension/public' into shubham1172/add-auto-upgrade…
shubham1172 Dec 8, 2022
7647b13
Merge branch 'k8s-extension/public' into shubham1172/add-auto-upgrade…
NarayanThiru Dec 16, 2022
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
10 changes: 10 additions & 0 deletions src/k8s-extension/azext_k8s_extension/partner_extensions/Dapr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,26 @@ def Update(self, cmd, resource_group_name: str, cluster_name: str, auto_upgrade_
configuration_settings = {}

# If we are downgrading the extension, then we need to disable the apply-CRDs hook.
# Additionally, if we are disabling auto-upgrades, we need to disable the apply-CRDs hook (as auto-upgrade is always on the latest version).
# This is because CRD updates while downgrading can cause issues.
# As CRDs are additive, skipping their removal while downgrading is safe.
original_version = original_extension.version
original_auto_upgrade = original_extension.auto_upgrade_minor_version
if self.APPLY_CRDS_HOOK_ENABLED_KEY in configuration_settings:
logger.debug("'%s' is set to '%s' in --configuration-settings, not overriding it.",
self.APPLY_CRDS_HOOK_ENABLED_KEY, configuration_settings[self.APPLY_CRDS_HOOK_ENABLED_KEY])
elif original_auto_upgrade and not auto_upgrade_minor_version:
logger.debug("Auto-upgrade is disabled and version is pinned to %s. Setting '%s' to false.",
version, self.APPLY_CRDS_HOOK_ENABLED_KEY)
configuration_settings[self.APPLY_CRDS_HOOK_ENABLED_KEY] = 'false'
elif original_version and version and version < original_version:
logger.debug("Downgrade detected from %s to %s. Setting %s to false.",
original_version, version, self.APPLY_CRDS_HOOK_ENABLED_KEY)
configuration_settings[self.APPLY_CRDS_HOOK_ENABLED_KEY] = 'false'
elif original_version and version and version == original_version:
logger.debug("Version unchanged at %s. Setting %s to false.",
version, self.APPLY_CRDS_HOOK_ENABLED_KEY)
configuration_settings[self.APPLY_CRDS_HOOK_ENABLED_KEY] = 'false'
else:
# If we are not downgrading, enable the apply-CRDs hook explicitly.
# This is because the value may have been set to false during a previous downgrade.
Expand Down