Skip to content

fix: preserve restricted management policies #41

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
patrickleet merged 2 commits into from
Aug 28, 2026
Merged

fix: preserve restricted management policies #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd91823
fix: preserve restricted management policies
patrickleet Aug 28, 2026
9cefd2e
fix: preserve empty management policies
patrickleet Aug 28, 2026
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
23 changes: 22 additions & 1 deletion functions/render/000-state-init.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,26 @@
{{- $name := $metadata.name | default "gitops" }}
{{- $clusterName := $spec.clusterName | default $name }}
{{- $namespace := $spec.namespace | default "argocd" }}
{{- $managementPolicies := $spec.managementPolicies | default (list "*") }}
{{- $managementPolicies := list "*" }}
{{- if hasKey $spec "managementPolicies" }}
{{- $managementPolicies = get $spec "managementPolicies" }}
{{- end }}
{{- $nonDeletingManagementPolicies := list }}
{{- if has "*" $managementPolicies }}
{{- $nonDeletingManagementPolicies = list "Observe" "Create" "Update" "LateInitialize" }}
{{- else }}
{{- range $policy := $managementPolicies }}
{{- if ne $policy "Delete" }}
{{- $nonDeletingManagementPolicies = append $nonDeletingManagementPolicies $policy }}
{{- end }}
{{- end }}
{{- end }}
{{- $observeUpdateManagementPolicies := list }}
{{- range $policy := list "Observe" "Update" }}
{{- if or (has "*" $managementPolicies) (has $policy $managementPolicies) }}
{{- $observeUpdateManagementPolicies = append $observeUpdateManagementPolicies $policy }}
{{- end }}
{{- end }}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

# Labels
{{- $defaultLabels := dict
Expand Down Expand Up @@ -163,6 +182,8 @@
"clusterName" $clusterName
"namespace" $namespace
"managementPolicies" $managementPolicies
"nonDeletingManagementPolicies" $nonDeletingManagementPolicies
"observeUpdateManagementPolicies" $observeUpdateManagementPolicies
"labels" $labels
"helmProviderConfigRef" $helmProviderConfigRef
"kubernetesProviderConfigRef" $k8sProviderConfigRef
Expand Down
2 changes: 1 addition & 1 deletion functions/render/210-github-repository.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
{{- if $repo.allowDelete }}
managementPolicies: {{ $state.managementPolicies | toJson }}
{{- else }}
managementPolicies: ["Observe", "Create", "Update", "LateInitialize"]
managementPolicies: {{ $state.nonDeletingManagementPolicies | toJson }}
{{- end }}
forProvider:
name: {{ $repo.name }}
Expand Down
4 changes: 1 addition & 3 deletions functions/render/440-zitadel-client-secret.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ metadata:
{{ setResourceNameAnnotation "zitadel-client-secret" }}
labels: {{ $state.labels | toJson }}
spec:
managementPolicies:
- Observe
- Update
managementPolicies: {{ $state.observeUpdateManagementPolicies | toJson }}
forProvider:
manifest:
apiVersion: v1
Expand Down
64 changes: 64 additions & 0 deletions tests/test-render/main.k
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,70 @@ _items = [
}
}

# ==========================================================================
# Test 1b: Restricted parent policies never expand on the protected repo
# ==========================================================================
metav1alpha1.CompositionTest {
metadata.name = "observe-only-repository-stays-observe-only"
spec = {
compositionPath = "apis/gitopsstacks/composition.yaml"
xrdPath = "apis/gitopsstacks/definition.yaml"
timeoutSeconds = 60
validate = False
xr = stacksv1alpha1.GitopsStack {
metadata.name = "observe-only"
spec = {
clusterName = "test-cluster"
managementPolicies = ["Observe", "LateInitialize"]
repository.org = "hops-ops"
}
}
assertResources = [
{
apiVersion = "repo.github.m.upbound.io/v1alpha1"
kind = "Repository"
metadata.name = "test-cluster-gitops"
spec.managementPolicies = ["Observe", "LateInitialize"]
}
]
}
}

# ==========================================================================
# Test 1c: An explicit empty policy list stays empty
# ==========================================================================
metav1alpha1.CompositionTest {
metadata.name = "empty-management-policies-stay-empty"
spec = {
compositionPath = "apis/gitopsstacks/composition.yaml"
xrdPath = "apis/gitopsstacks/definition.yaml"
timeoutSeconds = 60
validate = False
xr = stacksv1alpha1.GitopsStack {
metadata.name = "no-authority"
spec = {
clusterName = "test-cluster"
managementPolicies = []
repository.org = "hops-ops"
}
}
assertResources = [
{
apiVersion = "helm.m.crossplane.io/v1beta1"
kind = "Release"
metadata.name = "argocd"
spec.managementPolicies = []
}
{
apiVersion = "repo.github.m.upbound.io/v1alpha1"
kind = "Repository"
metadata.name = "test-cluster-gitops"
spec.managementPolicies = []
}
]
}
}

# ==========================================================================
# Test 2: Custom labels merged with defaults
# ==========================================================================
Expand Down
Loading