Merge pull request #19 from ytsarev/namespace-skip

Handle Namespace v1 in the uptest run
crossplane · Jul 29, 2024 · d016c0a · d016c0a
2 parents 34b893e + be9fe26
commit d016c0a
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 3 deletions.
diff --git a/internal/templates/00-assert.yaml.tmpl b/internal/templates/00-assert.yaml.tmpl
@@ -10,6 +10,9 @@ commands:
 {{- if eq $resource.KindGroup "secret." -}}
   {{continue}}
 {{- end -}}
+{{- if eq $resource.KindGroup "namespace." -}}
+  {{continue}}
+{{- end -}}
 {{- if $resource.PreAssertScriptPath }}
 - command: {{ $resource.PreAssertScriptPath }}
 {{- end }}

diff --git a/internal/templates/01-assert.yaml.tmpl b/internal/templates/01-assert.yaml.tmpl
@@ -8,6 +8,9 @@ commands:
 {{- if eq $resource.KindGroup "secret." -}}
   {{continue}}
 {{- end -}}
+{{- if eq $resource.KindGroup "namespace." -}}
+  {{continue}}
+{{- end -}}
 {{- if not $resource.Namespace }}
 {{- if $resource.Root }}
 - script: ${KUBECTL} get {{ $resource.KindGroup }}/{{ $resource.Name }} -o=jsonpath='{.status.atProvider{{ $resource.UpdateAssertKey }}}' | grep -q "^{{ $resource.UpdateAssertValue }}$"

diff --git a/internal/templates/01-update.yaml.tmpl b/internal/templates/01-update.yaml.tmpl
@@ -6,6 +6,9 @@ commands:
 {{- if eq $resource.KindGroup "secret." -}}
   {{continue}}
 {{- end -}}
+{{- if eq $resource.KindGroup "namespace." -}}
+  {{continue}}
+{{- end -}}
 {{- if not $resource.Namespace }}
 {{- if $resource.Root }}
 - command: ${KUBECTL} patch {{ $resource.KindGroup }}/{{ $resource.Name }} --type=merge -p '{"spec":{"forProvider":{{ $resource.UpdateParameter }}}}'

diff --git a/internal/templates/02-assert.yaml.tmpl b/internal/templates/02-assert.yaml.tmpl
@@ -8,6 +8,9 @@ commands:
 {{- if eq $resource.KindGroup "secret." -}}
   {{continue}}
 {{- end -}}
+{{- if eq $resource.KindGroup "namespace." -}}
+  {{continue}}
+{{- end -}}
 {{- range $condition := $resource.Conditions }}
 {{- if not $resource.Namespace }}
 - command: ${KUBECTL} wait {{ $resource.KindGroup }}/{{ $resource.Name }} --for=condition={{ $condition }} --timeout 10s

diff --git a/internal/templates/02-import.yaml.tmpl b/internal/templates/02-import.yaml.tmpl
@@ -15,6 +15,9 @@ commands:
 {{- if eq $resource.KindGroup "secret." -}}
   {{continue}}
 {{- end -}}
+{{- if eq $resource.KindGroup "namespace." -}}
+  {{continue}}
+{{- end -}}
 {{- if not $resource.Namespace }}
 - script: /tmp/patch.sh {{ $resource.KindGroup }} {{ $resource.Name }}
 {{- end }}

diff --git a/internal/templates/03-assert.yaml.tmpl b/internal/templates/03-assert.yaml.tmpl
@@ -9,6 +9,9 @@ commands:
 {{- if eq $resource.KindGroup "secret." -}}
   {{continue}}
 {{- end -}}
+{{- if eq $resource.KindGroup "namespace." -}}
+  {{continue}}
+{{- end -}}
 {{- if $resource.Namespace }}
 - script: ${KUBECTL} wait {{ $resource.KindGroup }}/{{ $resource.Name }} --for=delete --timeout 10s --namespace {{ $resource.Namespace }}
 {{- else }}

diff --git a/internal/templates/03-delete.yaml.tmpl b/internal/templates/03-delete.yaml.tmpl
@@ -6,6 +6,9 @@ commands:
 {{- if eq $resource.KindGroup "secret." -}}
   {{continue}}
 {{- end -}}
+{{- if eq $resource.KindGroup "namespace." -}}
+  {{continue}}
+{{- end -}}
 {{- if $resource.PreDeleteScriptPath }}
 - command: {{ $resource.PreDeleteScriptPath }}
 {{- end }}

diff --git a/internal/templates/renderer_test.go b/internal/templates/renderer_test.go
@@ -43,6 +43,12 @@ type: Opaque
 data:
   key: dmFsdWU=
 `
+
+	namespaceManifest = `apiVersion: v1
+kind: Namespace
+metadata:
+  name: test-namespace
+`
 )
 
 func TestRender(t *testing.T) {
@@ -173,6 +179,11 @@ commands:
 						KindGroup: "secret.",
 						Namespace: "upbound-system",
 					},
+					{
+						YAML:      namespaceManifest,
+						Name:      "test-namespace",
+						KindGroup: "namespace.",
+					},
 				},
 			},
 			want: want{
@@ -182,7 +193,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
 - command: /tmp/setup.sh
-` + "---\n" + bucketManifest + "---\n" + claimManifest + "---\n" + secretManifest,
+` + "---\n" + bucketManifest + "---\n" + claimManifest + "---\n" + secretManifest + "---\n" + namespaceManifest,
 					"00-assert.yaml": `# This assert file belongs to the resource apply step.
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
@@ -384,6 +395,11 @@ commands:
 						KindGroup: "secret.",
 						Namespace: "upbound-system",
 					},
+					{
+						YAML:      namespaceManifest,
+						Name:      "test-namespace",
+						KindGroup: "namespace.",
+					},
 				},
 			},
 			want: want{
@@ -393,7 +409,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
 - command: /tmp/setup.sh
-` + "---\n" + bucketManifest + "---\n" + claimManifest + "---\n" + secretManifest,
+` + "---\n" + bucketManifest + "---\n" + claimManifest + "---\n" + secretManifest + "---\n" + namespaceManifest,
 					"00-assert.yaml": `# This assert file belongs to the resource apply step.
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
@@ -478,6 +494,11 @@ commands:
 						KindGroup: "secret.",
 						Namespace: "upbound-system",
 					},
+					{
+						YAML:      namespaceManifest,
+						Name:      "test-namespace",
+						KindGroup: "namespace.",
+					},
 				},
 			},
 			want: want{
@@ -487,7 +508,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
 - command: /tmp/setup.sh
-` + "---\n" + bucketManifest + "---\n" + claimManifest + "---\n" + secretManifest,
+` + "---\n" + bucketManifest + "---\n" + claimManifest + "---\n" + secretManifest + "---\n" + namespaceManifest,
 					"00-assert.yaml": `# This assert file belongs to the resource apply step.
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert