Skip to content

Bugfix/fix kk configure reconciliation #589

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

Merged
merged 5 commits into from
Jan 17, 2025
Merged

Bugfix/fix kk configure reconciliation #589

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9de782e
fix
klinch0 Jan 16, 2025
191c8b4
Merge branch 'aenix-io:main' into main
klinch0 Jan 16, 2025
7afb85e
bugfix/fix-kk-configure-reconciliation
klinch0 Jan 17, 2025
2b3c1d3
Update packages/core/platform/bundles/paas-hosted.yaml
klinch0 Jan 17, 2025
b33d348
Update packages/core/platform/bundles/paas-full.yaml
klinch0 Jan 17, 2025
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
3 changes: 3 additions & 0 deletions packages/core/platform/bundles/paas-full.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,4 +299,7 @@ releases:
chart: cozy-keycloak-configure
namespace: cozy-keycloak
dependsOn: [keycloak-operator]
values:
cozyValues: |
{{ (lookup "v1" "ConfigMap" "cozy-system" "cozystack").data | toJson | sha256sum }}
{{- end }}
3 changes: 3 additions & 0 deletions packages/core/platform/bundles/paas-hosted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,7 @@ releases:
chart: cozy-keycloak-configure
namespace: cozy-keycloak
dependsOn: [keycloak-operator]
values:
cozyValues: |
{{ (lookup "v1" "ConfigMap" "cozy-system" "cozystack").data | toJson | sha256sum }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add error handling for ConfigMap lookup.

The code assumes that the cozystack ConfigMap exists in the cozy-system namespace. While this is likely true given the context, it's better to handle potential errors gracefully.

Consider adding a check:

  values:
    cozyValues: |
-      {{ (lookup "v1" "ConfigMap" "cozy-system" "cozystack").data | toJson | sha256sum }}
+      {{- $config := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
+      {{- if not $config }}
+      {{- fail "ERROR: cozystack ConfigMap not found in cozy-system namespace" }}
+      {{- end }}
+      {{ $config.data | toJson | sha256sum }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
values:
cozyValues: |
{{ (lookup "v1" "ConfigMap" "cozy-system" "cozystack").data | toJson | sha256sum }}
values:
cozyValues: |
{{- $config := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
{{- if not $config }}
{{- fail "ERROR: cozystack ConfigMap not found in cozy-system namespace" }}
{{- end }}
{{ $config.data | toJson | sha256sum }}

{{- end }}