diff --git a/internal/controller/ipaddressclaim_controller.go b/internal/controller/ipaddressclaim_controller.go index 1216d0e1..2045efe4 100644 --- a/internal/controller/ipaddressclaim_controller.go +++ b/internal/controller/ipaddressclaim_controller.go @@ -192,6 +192,10 @@ func (r *IpAddressClaimReconciler) Reconcile(ctx context.Context, req ctrl.Reque ipAddress.Spec.Comments = updatedIpAddressSpec.Comments ipAddress.Spec.Description = updatedIpAddressSpec.Description ipAddress.Spec.PreserveInNetbox = updatedIpAddressSpec.PreserveInNetbox + err = controllerutil.SetControllerReference(o, ipAddress, r.Scheme) + if err != nil { + return err + } return nil }) if err != nil { diff --git a/internal/controller/iprangeclaim_controller.go b/internal/controller/iprangeclaim_controller.go index 4f48d8f0..5827ccdf 100644 --- a/internal/controller/iprangeclaim_controller.go +++ b/internal/controller/iprangeclaim_controller.go @@ -147,6 +147,11 @@ func (r *IpRangeClaimReconciler) Reconcile(ctx context.Context, req ctrl.Request // update spec of IpRange object logger.V(4).Info("update iprange resource") ipRange.Spec = generateIpRangeSpec(o, ipRange.Spec.StartAddress, ipRange.Spec.EndAddress, logger) + err = controllerutil.SetControllerReference(o, ipRange, r.Scheme) + if err != nil { + return ctrl.Result{}, err + } + err = r.Client.Update(ctx, ipRange) if err != nil { return ctrl.Result{}, err diff --git a/internal/controller/prefixclaim_controller.go b/internal/controller/prefixclaim_controller.go index 260a290c..839fb2a7 100644 --- a/internal/controller/prefixclaim_controller.go +++ b/internal/controller/prefixclaim_controller.go @@ -318,6 +318,10 @@ func (r *PrefixClaimReconciler) Reconcile(ctx context.Context, req ctrl.Request) prefix.Spec.Description = updatedPrefixSpec.Description prefix.Spec.Comments = updatedPrefixSpec.Comments prefix.Spec.PreserveInNetbox = updatedPrefixSpec.PreserveInNetbox + err = controllerutil.SetControllerReference(prefixClaim, prefix, r.Scheme) + if err != nil { + return err + } return nil }); err != nil { return ctrl.Result{}, err diff --git a/kind/load-local-data-job/main.py b/kind/load-local-data-job/main.py index d9a0e87f..bbac5497 100644 --- a/kind/load-local-data-job/main.py +++ b/kind/load-local-data-job/main.py @@ -350,7 +350,7 @@ class Prefix: ), Prefix( prefix="3.0.5.0/24", - description="", + description="chainsaw test prefixclaim-ipv4-update-ownerreference", site=None, tenant={ "name": "MY_TENANT", @@ -525,7 +525,7 @@ class Prefix: ), Prefix( prefix="3.1.3.0/24", - description="", + description="chainsaw test ipaddressclaim-ipv4-update-ownerreference", site=None, tenant={ "name": "MY_TENANT", @@ -766,7 +766,7 @@ class Prefix: ), Prefix( prefix="3.2.4.0/24", - description="", + description="chainsaw test iprangeclaim-ipv4-update-ownerreference", site=None, tenant={ "name": "MY_TENANT", diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-invalid-parentprefixselector/chainsaw-test.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-invalid-parentprefixselector/chainsaw-test.yaml index 3e80e47b..8ddabfdd 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-invalid-parentprefixselector/chainsaw-test.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-invalid-parentprefixselector/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -54,4 +53,4 @@ spec: cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-invalid-parentprefixselector -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-invalid-parentprefixselector -n $NAMESPACE diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-invalid-parentprefixselector/netbox_v1_prefixclaim.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-invalid-parentprefixselector/netbox_v1_prefixclaim.yaml index 02daf02b..68b5600d 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-invalid-parentprefixselector/netbox_v1_prefixclaim.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-invalid-parentprefixselector/netbox_v1_prefixclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/chainsaw-test.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/chainsaw-test.yaml index f8a823e5..a8c05074 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/chainsaw-test.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -84,4 +83,4 @@ spec: cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefix-apply-update -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefix-apply-update -n $NAMESPACE diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/netbox_v1_prefixclaim-update.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/netbox_v1_prefixclaim-update.yaml index bb12a2d4..d51789f8 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/netbox_v1_prefixclaim-update.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/netbox_v1_prefixclaim-update.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/netbox_v1_prefixclaim.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/netbox_v1_prefixclaim.yaml index 8eada6a0..8fe50871 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/netbox_v1_prefixclaim.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-apply-update/netbox_v1_prefixclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/chainsaw-test.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/chainsaw-test.yaml index 34ee5f9d..103b9ac5 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/chainsaw-test.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -133,46 +132,46 @@ spec: - name: Set preserveInNetbox to false description: Set preserveInNetbox to false to clean up the NetBox test instance try: - - patch: - resource: - apiVersion: netbox.dev/v1 - kind: PrefixClaim - metadata: - name: prefixclaim-ipv4-parentprefix-restore-1 - spec: - preserveInNetbox: false - - patch: - resource: - apiVersion: netbox.dev/v1 - kind: PrefixClaim - metadata: - name: prefixclaim-ipv4-parentprefix-restore-2 - spec: - preserveInNetbox: false - - assert: - resource: - apiVersion: netbox.dev/v1 - kind: Prefix - metadata: - name: prefixclaim-ipv4-parentprefix-restore-1 - status: - (conditions[?type == 'Ready']): - - observedGeneration: 2 - status: 'True' - - assert: - resource: - apiVersion: netbox.dev/v1 - kind: Prefix - metadata: - name: prefixclaim-ipv4-parentprefix-restore-2 - status: - (conditions[?type == 'Ready']): - - observedGeneration: 2 - status: 'True' + - patch: + resource: + apiVersion: netbox.dev/v1 + kind: PrefixClaim + metadata: + name: prefixclaim-ipv4-parentprefix-restore-1 + spec: + preserveInNetbox: false + - patch: + resource: + apiVersion: netbox.dev/v1 + kind: PrefixClaim + metadata: + name: prefixclaim-ipv4-parentprefix-restore-2 + spec: + preserveInNetbox: false + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: Prefix + metadata: + name: prefixclaim-ipv4-parentprefix-restore-1 + status: + (conditions[?type == 'Ready']): + - observedGeneration: 2 + status: 'True' + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: Prefix + metadata: + name: prefixclaim-ipv4-parentprefix-restore-2 + status: + (conditions[?type == 'Ready']): + - observedGeneration: 2 + status: 'True' - name: Cleanup events description: Events cleanup required to fix issues with failing tests that assert the wrong Error resource cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefix-restore-1 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefix-restore-2 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefix-restore-1 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefix-restore-2 -n $NAMESPACE diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/netbox_v1_prefixclaim_1.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/netbox_v1_prefixclaim_1.yaml index 9e5ca433..0c052d67 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/netbox_v1_prefixclaim_1.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/netbox_v1_prefixclaim_1.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/netbox_v1_prefixclaim_2.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/netbox_v1_prefixclaim_2.yaml index b4040243..f2d8fa17 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/netbox_v1_prefixclaim_2.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefix-restore/netbox_v1_prefixclaim_2.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-nonexisingcustomfield/chainsaw-test.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-nonexisingcustomfield/chainsaw-test.yaml index 1180f68a..c45d8aa3 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-nonexisingcustomfield/chainsaw-test.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-nonexisingcustomfield/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -63,4 +62,4 @@ spec: cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefixselector-nonexisingcustomfield -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefixselector-nonexisingcustomfield -n $NAMESPACE diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-nonexisingcustomfield/netbox_v1_prefixclaim.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-nonexisingcustomfield/netbox_v1_prefixclaim.yaml index 6bf76dfd..8df2e862 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-nonexisingcustomfield/netbox_v1_prefixclaim.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-nonexisingcustomfield/netbox_v1_prefixclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/chainsaw-test.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/chainsaw-test.yaml index 6c160360..03b61eb9 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/chainsaw-test.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -146,28 +145,28 @@ spec: - name: Set preserveInNetbox to false description: Set preserveInNetbox to false to clean up the NetBox test instance try: - - patch: - resource: - apiVersion: netbox.dev/v1 - kind: PrefixClaim - metadata: - name: prefixclaim-ipv4-parentprefixselector-restore-1 - spec: - preserveInNetbox: false - - assert: - resource: - apiVersion: netbox.dev/v1 - kind: Prefix - metadata: - name: prefixclaim-ipv4-parentprefixselector-restore-1 - status: - (conditions[?type == 'Ready']): - - observedGeneration: 2 - status: 'True' + - patch: + resource: + apiVersion: netbox.dev/v1 + kind: PrefixClaim + metadata: + name: prefixclaim-ipv4-parentprefixselector-restore-1 + spec: + preserveInNetbox: false + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: Prefix + metadata: + name: prefixclaim-ipv4-parentprefixselector-restore-1 + status: + (conditions[?type == 'Ready']): + - observedGeneration: 2 + status: 'True' - name: Cleanup events description: Events cleanup required to fix issues with failing tests that assert the wrong Error resource cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefixselector-restore-1 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefixselector-restore-2 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefixselector-restore-1 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefixselector-restore-2 -n $NAMESPACE diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/netbox_v1_prefixclaim_1.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/netbox_v1_prefixclaim_1.yaml index 9a148990..f25d8a25 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/netbox_v1_prefixclaim_1.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/netbox_v1_prefixclaim_1.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/netbox_v1_prefixclaim_2.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/netbox_v1_prefixclaim_2.yaml index 284d9d9a..d8239404 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/netbox_v1_prefixclaim_2.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector-restore/netbox_v1_prefixclaim_2.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector/chainsaw-test.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector/chainsaw-test.yaml index 73100ce9..0c554c03 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector/chainsaw-test.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -53,27 +52,27 @@ spec: - name: Set preserveInNetbox to false description: Set preserveInNetbox to false to clean up the NetBox test instance try: - - patch: - resource: - apiVersion: netbox.dev/v1 - kind: PrefixClaim - metadata: - name: prefixclaim-ipv4-parentprefixselector-apply - spec: - preserveInNetbox: false - - assert: - resource: - apiVersion: netbox.dev/v1 - kind: Prefix - metadata: - name: prefixclaim-ipv4-parentprefixselector-apply - status: - (conditions[?type == 'Ready']): - - observedGeneration: 2 - status: 'True' + - patch: + resource: + apiVersion: netbox.dev/v1 + kind: PrefixClaim + metadata: + name: prefixclaim-ipv4-parentprefixselector-apply + spec: + preserveInNetbox: false + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: Prefix + metadata: + name: prefixclaim-ipv4-parentprefixselector-apply + status: + (conditions[?type == 'Ready']): + - observedGeneration: 2 + status: 'True' - name: Cleanup events description: Events cleanup required to fix issues with failing tests that assert the wrong Error resource cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefixselector-apply -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-parentprefixselector-apply -n $NAMESPACE diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector/netbox_v1_prefixclaim.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector/netbox_v1_prefixclaim.yaml index 0f6bb5ed..9511071f 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector/netbox_v1_prefixclaim.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-parentprefixselector/netbox_v1_prefixclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/chainsaw-test.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/chainsaw-test.yaml index f8c7d436..d687f60f 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/chainsaw-test.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -103,6 +102,6 @@ spec: cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-prefixexhausted-1 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-prefixexhausted-2 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-prefixexhausted-3 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-prefixexhausted-1 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-prefixexhausted-2 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-prefixexhausted-3 -n $NAMESPACE diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_1.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_1.yaml index a25f44c3..e28b0cc4 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_1.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_1.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_2.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_2.yaml index 1039c86b..394b1b1e 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_2.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_2.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_3.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_3.yaml index 7ac517eb..ffa12595 100644 --- a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_3.yaml +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-prefixexhausted/netbox_v1_prefixclaim_3.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: PrefixClaim metadata: diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-update-ownerreference/chainsaw-test.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-update-ownerreference/chainsaw-test.yaml new file mode 100644 index 00000000..9936b25b --- /dev/null +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-update-ownerreference/chainsaw-test.yaml @@ -0,0 +1,78 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + name: prefixclaim-ipv4-update-ownerreference + annotations: + description: Tests if controller updates ownerReference if non-Claim resource existed before (e.g. from a velero backup) +spec: + steps: + - name: Apply CR 1 + try: + - apply: + file: netbox_v1_prefix_1.yaml + - name: Check non-claim CR 1 spec and status + try: + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: Prefix + metadata: + name: prefixclaim-ipv4-update-ownerreference-1 + status: + (conditions[?type == 'Ready']): + - status: "True" + - name: Apply CR 1 + try: + - apply: + file: netbox_v1_prefixclaim_1.yaml + - name: Check claim CR 1 spec and status + try: + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: PrefixClaim + metadata: + name: prefixclaim-ipv4-update-ownerreference-1 + spec: + comments: your comments + description: some description + parentPrefix: 3.0.5.0/24 + prefixLength: /28 + preserveInNetbox: false + tenant: MY_TENANT + status: + (conditions[?type == 'Ready']): + - status: "True" + parentPrefix: 3.0.5.0/24 + prefix: 3.0.5.0/28 + prefixName: prefixclaim-ipv4-update-ownerreference-1 + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: Prefix + metadata: + finalizers: + - prefix.netbox.dev/finalizer + name: prefixclaim-ipv4-update-ownerreference-1 + ownerReferences: + - apiVersion: netbox.dev/v1 + blockOwnerDeletion: true + controller: true + kind: PrefixClaim + name: prefixclaim-ipv4-update-ownerreference-1 + spec: + comments: your comments + customFields: + netboxOperatorRestorationHash: 8ed6d9825bc218cf0b6f7ab39272637d95d318a4 + description: some description + prefix: 3.0.5.0/28 + tenant: MY_TENANT + status: + (conditions[?type == 'Ready']): + - status: "True" + - name: Cleanup events + description: Events cleanup required to fix issues with failing tests that assert the wrong Error resource + cleanup: + - script: + content: | + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv4-update-ownerreference-1 -n $NAMESPACE diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-update-ownerreference/netbox_v1_prefix_1.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-update-ownerreference/netbox_v1_prefix_1.yaml new file mode 100644 index 00000000..28384041 --- /dev/null +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-update-ownerreference/netbox_v1_prefix_1.yaml @@ -0,0 +1,11 @@ +apiVersion: netbox.dev/v1 +kind: Prefix +metadata: + name: prefixclaim-ipv4-update-ownerreference-1 +spec: + comments: your comments + customFields: + netboxOperatorRestorationHash: 8ed6d9825bc218cf0b6f7ab39272637d95d318a4 + description: some description + prefix: 3.0.5.0/28 + tenant: MY_TENANT diff --git a/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-update-ownerreference/netbox_v1_prefixclaim_1.yaml b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-update-ownerreference/netbox_v1_prefixclaim_1.yaml new file mode 100644 index 00000000..62f80a05 --- /dev/null +++ b/tests/e2e/Prefix/IPv4/prefixclaim-ipv4-update-ownerreference/netbox_v1_prefixclaim_1.yaml @@ -0,0 +1,11 @@ +apiVersion: netbox.dev/v1 +kind: PrefixClaim +metadata: + name: prefixclaim-ipv4-update-ownerreference-1 +spec: + comments: your comments + description: some description + parentPrefix: 3.0.5.0/24 + preserveInNetbox: false + tenant: MY_TENANT + prefixLength: "/28" diff --git a/tests/e2e/Prefix/IPv6/prefixclaim-ipv6-apply-update/chainsaw-test.yaml b/tests/e2e/Prefix/IPv6/prefixclaim-ipv6-apply-update/chainsaw-test.yaml index 5e4a441a..d4037f53 100644 --- a/tests/e2e/Prefix/IPv6/prefixclaim-ipv6-apply-update/chainsaw-test.yaml +++ b/tests/e2e/Prefix/IPv6/prefixclaim-ipv6-apply-update/chainsaw-test.yaml @@ -89,27 +89,27 @@ spec: - name: Set preserveInNetbox to false description: Set preserveInNetbox to false to clean up the NetBox test instance try: - - patch: - resource: - apiVersion: netbox.dev/v1 - kind: PrefixClaim - metadata: - name: prefixclaim-ipv6-apply-update - spec: - preserveInNetbox: false - - assert: - resource: - apiVersion: netbox.dev/v1 - kind: Prefix - metadata: - name: prefixclaim-ipv6-apply-update - status: - (conditions[?type == 'Ready']): - - observedGeneration: 3 - status: 'True' + - patch: + resource: + apiVersion: netbox.dev/v1 + kind: PrefixClaim + metadata: + name: prefixclaim-ipv6-apply-update + spec: + preserveInNetbox: false + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: Prefix + metadata: + name: prefixclaim-ipv6-apply-update + status: + (conditions[?type == 'Ready']): + - observedGeneration: 3 + status: 'True' - name: Cleanup events description: Events cleanup required to fix issues with failing tests that assert the wrong Error resource cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv6-apply-update -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=prefixclaim-ipv6-apply-update -n $NAMESPACE diff --git a/tests/e2e/Prefix/IPv6/prefixclaim-ipv6-apply-update/netbox_v1_prefixclaim.yaml b/tests/e2e/Prefix/IPv6/prefixclaim-ipv6-apply-update/netbox_v1_prefixclaim.yaml index 4a71cc04..05aa6e0e 100644 --- a/tests/e2e/Prefix/IPv6/prefixclaim-ipv6-apply-update/netbox_v1_prefixclaim.yaml +++ b/tests/e2e/Prefix/IPv6/prefixclaim-ipv6-apply-update/netbox_v1_prefixclaim.yaml @@ -15,6 +15,5 @@ spec: # if the entry for tenant or site is missing, it will *not* inherit from the tenant and site from the Spec tenant: "MY_TENANT" # Use the `name` value instead of the `slug` value family: "IPv6" # Can only be either IPv4 or IPv6" - environment: "production" poolName: "pool 4" diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/chainsaw-test.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/chainsaw-test.yaml index 5aa99f7f..3225d16d 100644 --- a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/chainsaw-test.yaml +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -112,4 +111,4 @@ spec: cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-apply-update -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-apply-update -n $NAMESPACE diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/netbox_v1_ipaddressclaim-update.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/netbox_v1_ipaddressclaim-update.yaml index e7f830dc..526268fd 100644 --- a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/netbox_v1_ipaddressclaim-update.yaml +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/netbox_v1_ipaddressclaim-update.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/netbox_v1_ipaddressclaim.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/netbox_v1_ipaddressclaim.yaml index 3d04bf32..0dcc0175 100644 --- a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/netbox_v1_ipaddressclaim.yaml +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-apply-update/netbox_v1_ipaddressclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/chainsaw-test.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/chainsaw-test.yaml index dccd850a..68fe6b91 100644 --- a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/chainsaw-test.yaml +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -118,7 +117,7 @@ spec: preserveInNetbox: false tenant: MY_TENANT status: - (conditions[?type == 'IPAssigned']): # TODO(jstudler): Change this to Ready, will need change in SetConditionAndCreateEvent to also update Ready condition + (conditions[?type == 'IPAssigned']): # TODO(jstudler): Change this to Ready, will need change in SetConditionAndCreateEvent to also update Ready condition - status: 'False' - assert: resource: @@ -138,6 +137,6 @@ spec: cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-prefixexhausted-1 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-prefixexhausted-2 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-prefixexhausted-3 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-prefixexhausted-1 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-prefixexhausted-2 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-prefixexhausted-3 -n $NAMESPACE diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_1.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_1.yaml index ba5f8575..74bb7fe9 100644 --- a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_1.yaml +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_1.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_2.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_2.yaml index 320b643b..446ec4ba 100644 --- a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_2.yaml +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_2.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_3.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_3.yaml index e2bef0c7..bdf702c2 100644 --- a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_3.yaml +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-prefixexhausted/netbox_v1_ipaddressclaim_3.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/chainsaw-test.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/chainsaw-test.yaml index f6884b73..a202d558 100644 --- a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/chainsaw-test.yaml +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -46,7 +45,7 @@ spec: spec: comments: your comments customFields: - netboxOperatorRestorationHash: c7113eab8a61aad6a7618acb510622555d75d0c3 # note that this will require the tests to run in the e2e namespace! + netboxOperatorRestorationHash: c7113eab8a61aad6a7618acb510622555d75d0c3 # note that this will require the tests to run in the e2e namespace! description: some description ipAddress: 3.1.2.1/32 preserveInNetbox: true @@ -147,7 +146,7 @@ spec: spec: comments: your comments customFields: - netboxOperatorRestorationHash: c7113eab8a61aad6a7618acb510622555d75d0c3 # note that this will require the tests to run in the e2e namespace! + netboxOperatorRestorationHash: c7113eab8a61aad6a7618acb510622555d75d0c3 # note that this will require the tests to run in the e2e namespace! description: some description ipAddress: 3.1.2.1/32 preserveInNetbox: true @@ -158,28 +157,28 @@ spec: - name: Set preserveInNetbox to false description: Set preserveInNetbox to false to clean up the NetBox test instance try: - - patch: - resource: - apiVersion: netbox.dev/v1 - kind: IpAddressClaim - metadata: - name: ipaddressclaim-ipv4-restore-1 - spec: - preserveInNetbox: false - - assert: - resource: - apiVersion: netbox.dev/v1 - kind: IpAddress - metadata: - name: ipaddressclaim-ipv4-restore-1 - status: - (conditions[?type == 'Ready']): - - observedGeneration: 2 - status: 'True' + - patch: + resource: + apiVersion: netbox.dev/v1 + kind: IpAddressClaim + metadata: + name: ipaddressclaim-ipv4-restore-1 + spec: + preserveInNetbox: false + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: IpAddress + metadata: + name: ipaddressclaim-ipv4-restore-1 + status: + (conditions[?type == 'Ready']): + - observedGeneration: 2 + status: 'True' - name: Cleanup events description: Events cleanup required to fix issues with failing tests that assert the wrong Error resource cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-restore-1 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-restore-2 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-restore-1 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-restore-2 -n $NAMESPACE diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/netbox_v1_ipaddressclaim_1.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/netbox_v1_ipaddressclaim_1.yaml index 2b412e94..c6aa4db3 100644 --- a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/netbox_v1_ipaddressclaim_1.yaml +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/netbox_v1_ipaddressclaim_1.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/netbox_v1_ipaddressclaim_2.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/netbox_v1_ipaddressclaim_2.yaml index aedbbaa4..51e79035 100644 --- a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/netbox_v1_ipaddressclaim_2.yaml +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-restore/netbox_v1_ipaddressclaim_2.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-update-ownerreference/chainsaw-test.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-update-ownerreference/chainsaw-test.yaml new file mode 100644 index 00000000..2ed28394 --- /dev/null +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-update-ownerreference/chainsaw-test.yaml @@ -0,0 +1,76 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + name: ipaddressclaim-ipv4-update-ownerreference + annotations: + description: Tests if controller updates ownerReference if non-Claim resource existed before (e.g. from a velero backup) +spec: + steps: + - name: Apply CR 1 + try: + - apply: + file: netbox_v1_ipaddress_1.yaml + - name: Check non-claim CR 1 spec and status + try: + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: IpAddress + metadata: + name: ipaddressclaim-ipv4-update-ownerreference-1 + status: + (conditions[?type == 'Ready']): + - status: 'True' + - name: Apply CR 1 + try: + - apply: + file: netbox_v1_ipaddressclaim_1.yaml + - name: Check claim CR 1 spec and status + try: + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: IpAddressClaim + metadata: + name: ipaddressclaim-ipv4-update-ownerreference-1 + spec: + comments: your comments + description: some description + parentPrefix: 3.1.3.0/24 + tenant: MY_TENANT + status: + (conditions[?type == 'Ready']): + - status: 'True' + ipAddress: 3.1.3.1/32 + ipAddressDotDecimal: 3.1.3.1 + ipAddressName: ipaddressclaim-ipv4-update-ownerreference-1 + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: IpAddress + metadata: + name: ipaddressclaim-ipv4-update-ownerreference-1 + finalizers: + - ipaddress.netbox.dev/finalizer + ownerReferences: + - apiVersion: netbox.dev/v1 + blockOwnerDeletion: true + controller: true + kind: IpAddressClaim + name: ipaddressclaim-ipv4-update-ownerreference-1 + spec: + comments: your comments + customFields: + netboxOperatorRestorationHash: e93f42d53e5114c6ef44ba878893856411596bbf # note that this will require the tests to run in the e2e namespace! + description: some description + ipAddress: 3.1.3.1/32 + tenant: MY_TENANT + status: + (conditions[?type == 'Ready']): + - status: 'True' + - name: Cleanup events + description: Events cleanup required to fix issues with failing tests that assert the wrong Error resource + cleanup: + - script: + content: | + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv4-update-ownerreference-1 -n $NAMESPACE diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-update-ownerreference/netbox_v1_ipaddress_1.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-update-ownerreference/netbox_v1_ipaddress_1.yaml new file mode 100644 index 00000000..0c50e4be --- /dev/null +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-update-ownerreference/netbox_v1_ipaddress_1.yaml @@ -0,0 +1,11 @@ +apiVersion: netbox.dev/v1 +kind: IpAddress +metadata: + name: ipaddressclaim-ipv4-update-ownerreference-1 +spec: + comments: your comments + customFields: + netboxOperatorRestorationHash: e93f42d53e5114c6ef44ba878893856411596bbf + description: some description + ipAddress: 3.1.3.1/32 + tenant: MY_TENANT diff --git a/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-update-ownerreference/netbox_v1_ipaddressclaim_1.yaml b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-update-ownerreference/netbox_v1_ipaddressclaim_1.yaml new file mode 100644 index 00000000..52231de8 --- /dev/null +++ b/tests/e2e/ipaddress/ipv4/ipaddressclaim-ipv4-update-ownerreference/netbox_v1_ipaddressclaim_1.yaml @@ -0,0 +1,10 @@ +apiVersion: netbox.dev/v1 +kind: IpAddressClaim +metadata: + name: ipaddressclaim-ipv4-update-ownerreference-1 +spec: + comments: your comments + description: some description + parentPrefix: 3.1.3.0/24 + preserveInNetbox: false + tenant: MY_TENANT diff --git a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/chainsaw-test.yaml b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/chainsaw-test.yaml index 179bf2c1..0e45758c 100644 --- a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/chainsaw-test.yaml +++ b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -112,4 +111,4 @@ spec: cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-apply-update -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-apply-update -n $NAMESPACE diff --git a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/netbox_v1_ipaddressclaim-update.yaml b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/netbox_v1_ipaddressclaim-update.yaml index cc9fc2bb..b992e7d9 100644 --- a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/netbox_v1_ipaddressclaim-update.yaml +++ b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/netbox_v1_ipaddressclaim-update.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/netbox_v1_ipaddressclaim.yaml b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/netbox_v1_ipaddressclaim.yaml index 1c0ca241..86aa6562 100644 --- a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/netbox_v1_ipaddressclaim.yaml +++ b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-apply-update/netbox_v1_ipaddressclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/chainsaw-test.yaml b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/chainsaw-test.yaml index 44986ead..8874d64c 100644 --- a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/chainsaw-test.yaml +++ b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -118,7 +117,7 @@ spec: preserveInNetbox: false tenant: MY_TENANT status: - (conditions[?type == 'IPAssigned']): # TODO(jstudler): Change this to Ready, will need change in SetConditionAndCreateEvent to also update Ready condition + (conditions[?type == 'IPAssigned']): # TODO(jstudler): Change this to Ready, will need change in SetConditionAndCreateEvent to also update Ready condition - status: 'False' - assert: resource: @@ -138,6 +137,6 @@ spec: cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-prefixexhausted-1 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-prefixexhausted-2 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-prefixexhausted-3 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-prefixexhausted-1 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-prefixexhausted-2 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-prefixexhausted-3 -n $NAMESPACE diff --git a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_1.yaml b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_1.yaml index f0b5f555..8f6c850f 100644 --- a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_1.yaml +++ b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_1.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_2.yaml b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_2.yaml index 5ee6677f..149cb176 100644 --- a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_2.yaml +++ b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_2.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_3.yaml b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_3.yaml index 02619580..c0e44c97 100644 --- a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_3.yaml +++ b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-prefixexhausted/netbox_v1_ipaddressclaim_3.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/chainsaw-test.yaml b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/chainsaw-test.yaml index 314b6800..29af423f 100644 --- a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/chainsaw-test.yaml +++ b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -46,7 +45,7 @@ spec: spec: comments: your comments customFields: - netboxOperatorRestorationHash: bf12294d295d4dadec934bc511dfaa78a87e171b # note that this will require the tests to run in the e2e namespace! + netboxOperatorRestorationHash: bf12294d295d4dadec934bc511dfaa78a87e171b # note that this will require the tests to run in the e2e namespace! description: some description ipAddress: 3:1:2::1/128 preserveInNetbox: true @@ -147,7 +146,7 @@ spec: spec: comments: your comments customFields: - netboxOperatorRestorationHash: bf12294d295d4dadec934bc511dfaa78a87e171b # note that this will require the tests to run in the e2e namespace! + netboxOperatorRestorationHash: bf12294d295d4dadec934bc511dfaa78a87e171b # note that this will require the tests to run in the e2e namespace! description: some description ipAddress: 3:1:2::1/128 preserveInNetbox: true @@ -158,28 +157,28 @@ spec: - name: Set preserveInNetbox to false description: Set preserveInNetbox to false to clean up the NetBox test instance try: - - patch: - resource: - apiVersion: netbox.dev/v1 - kind: IpAddressClaim - metadata: - name: ipaddressclaim-ipv6-restore-1 - spec: - preserveInNetbox: false - - assert: - resource: - apiVersion: netbox.dev/v1 - kind: IpAddress - metadata: - name: ipaddressclaim-ipv6-restore-1 - status: - (conditions[?type == 'Ready']): - - observedGeneration: 2 - status: 'True' + - patch: + resource: + apiVersion: netbox.dev/v1 + kind: IpAddressClaim + metadata: + name: ipaddressclaim-ipv6-restore-1 + spec: + preserveInNetbox: false + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: IpAddress + metadata: + name: ipaddressclaim-ipv6-restore-1 + status: + (conditions[?type == 'Ready']): + - observedGeneration: 2 + status: 'True' - name: Cleanup events description: Events cleanup required to fix issues with failing tests that assert the wrong Error resource cleanup: - script: content: | - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-restore-1 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-restore-2 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-restore-1 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=ipaddressclaim-ipv6-restore-2 -n $NAMESPACE diff --git a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/netbox_v1_ipaddressclaim_1.yaml b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/netbox_v1_ipaddressclaim_1.yaml index a50a52ec..0b5c0046 100644 --- a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/netbox_v1_ipaddressclaim_1.yaml +++ b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/netbox_v1_ipaddressclaim_1.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/netbox_v1_ipaddressclaim_2.yaml b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/netbox_v1_ipaddressclaim_2.yaml index 9b7f4b9b..e82b5a34 100644 --- a/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/netbox_v1_ipaddressclaim_2.yaml +++ b/tests/e2e/ipaddress/ipv6/ipaddressclaim-ipv6-restore/netbox_v1_ipaddressclaim_2.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpAddressClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/chainsaw-test.yaml index bb9dd737..167fc90e 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -122,8 +121,8 @@ spec: cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-apply-update -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-apply-update -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/netbox_v1_iprangeclaim-update.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/netbox_v1_iprangeclaim-update.yaml index dfe3d77f..028a21b2 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/netbox_v1_iprangeclaim-update.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/netbox_v1_iprangeclaim-update.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/netbox_v1_iprangeclaim.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/netbox_v1_iprangeclaim.yaml index b2e06eb5..1a6d3fba 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/netbox_v1_iprangeclaim.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/netbox_v1_iprangeclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-cidr/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-cidr/chainsaw-test.yaml index 458c3821..67ec8af4 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-cidr/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-cidr/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -19,8 +18,8 @@ spec: cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-cidr -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-cidr -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-cidr/netbox_v1_iprangeclaim.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-cidr/netbox_v1_iprangeclaim.yaml index 9994b7d1..fa1aa7c2 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-cidr/netbox_v1_iprangeclaim.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-cidr/netbox_v1_iprangeclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldnotexisting/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldnotexisting/chainsaw-test.yaml index 8dc62cc9..d2aa444d 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldnotexisting/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldnotexisting/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -65,8 +64,8 @@ spec: cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-customfieldnotexisting -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-customfieldnotexisting -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldnotexisting/netbox_v1_iprangeclaim.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldnotexisting/netbox_v1_iprangeclaim.yaml index dca2991e..6a5c953c 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldnotexisting/netbox_v1_iprangeclaim.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldnotexisting/netbox_v1_iprangeclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: @@ -14,4 +13,4 @@ spec: parentPrefix: "3.2.3.0/24" size: 30 customFields: - justmade: "thisup" \ No newline at end of file + justmade: "thisup" diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldwrongdatatype/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldwrongdatatype/chainsaw-test.yaml index 53c1150b..499aaeec 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldwrongdatatype/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldwrongdatatype/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -65,8 +64,8 @@ spec: cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-customfieldwrongdatatype -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-customfieldwrongdatatype -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldwrongdatatype/netbox_v1_iprangeclaim.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldwrongdatatype/netbox_v1_iprangeclaim.yaml index 6eb17aa1..fc668892 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldwrongdatatype/netbox_v1_iprangeclaim.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldwrongdatatype/netbox_v1_iprangeclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-parentprefix/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-parentprefix/chainsaw-test.yaml index d44868a4..24ad0f99 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-parentprefix/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-parentprefix/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -39,8 +38,8 @@ spec: cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-parentprefix -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-parentprefix -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-parentprefix/netbox_v1_iprangeclaim.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-parentprefix/netbox_v1_iprangeclaim.yaml index dd494e1e..e7095fbf 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-parentprefix/netbox_v1_iprangeclaim.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-parentprefix/netbox_v1_iprangeclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-size/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-size/chainsaw-test.yaml index b31d4ccf..b7099608 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-size/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-size/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -19,8 +18,8 @@ spec: cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-size -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-size -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-size/netbox_v1_iprangeclaim.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-size/netbox_v1_iprangeclaim.yaml index afb78a0c..5bcdcb9c 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-size/netbox_v1_iprangeclaim.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-size/netbox_v1_iprangeclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-tenant/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-tenant/chainsaw-test.yaml index b799eae3..56de3a02 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-tenant/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-tenant/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -45,8 +44,8 @@ spec: cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-tenant -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-tenant -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-tenant/netbox_v1_iprangeclaim.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-tenant/netbox_v1_iprangeclaim.yaml index 9329b407..c5331315 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-tenant/netbox_v1_iprangeclaim.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-tenant/netbox_v1_iprangeclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/chainsaw-test.yaml index bb3b0ea4..594ff8b0 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -127,7 +126,7 @@ spec: size: 30 tenant: MY_TENANT status: - (conditions[?type == 'IPRangeAssigned']): # TODO(jstudler): Change this to Ready, will need change in SetConditionAndCreateEvent to also update Ready condition + (conditions[?type == 'IPRangeAssigned']): # TODO(jstudler): Change this to Ready, will need change in SetConditionAndCreateEvent to also update Ready condition - status: 'False' - assert: resource: @@ -147,10 +146,10 @@ spec: cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-prefixexhausted-1 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-prefixexhausted-2 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-prefixexhausted-3 -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-prefixexhausted-1 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-prefixexhausted-2 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-prefixexhausted-3 -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_1.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_1.yaml index 54625b7f..e1f8cd07 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_1.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_1.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_2.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_2.yaml index 4665d00a..3eee358a 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_2.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_2.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_3.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_3.yaml index 58a4df99..7d6d3542 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_3.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/netbox_v1_iprangeclaim_3.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/chainsaw-test.yaml index 3b1d9341..9542419f 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -51,7 +50,7 @@ spec: spec: comments: your comments customFields: - netboxOperatorRestorationHash: 86776d57746f3262ef6f450b58c375e835bd914c # note that this will require the tests to run in the e2e namespace! + netboxOperatorRestorationHash: 86776d57746f3262ef6f450b58c375e835bd914c # note that this will require the tests to run in the e2e namespace! description: some description startAddress: 3.2.2.1/32 endAddress: 3.2.2.30/32 @@ -163,7 +162,7 @@ spec: spec: comments: your comments customFields: - netboxOperatorRestorationHash: 86776d57746f3262ef6f450b58c375e835bd914c # note that this will require the tests to run in the e2e namespace! + netboxOperatorRestorationHash: 86776d57746f3262ef6f450b58c375e835bd914c # note that this will require the tests to run in the e2e namespace! description: some description startAddress: 3.2.2.1/32 endAddress: 3.2.2.30/32 @@ -175,32 +174,32 @@ spec: - name: Set preserveInNetbox to false description: Set preserveInNetbox to false to clean up the NetBox test instance try: - - patch: - resource: - apiVersion: netbox.dev/v1 - kind: IpRangeClaim - metadata: - name: iprangeclaim-ipv4-restore-1 - spec: - preserveInNetbox: false - - assert: - resource: - apiVersion: netbox.dev/v1 - kind: IpRange - metadata: - name: iprangeclaim-ipv4-restore-1 - status: - (conditions[?type == 'Ready']): - - observedGeneration: 2 - status: 'True' + - patch: + resource: + apiVersion: netbox.dev/v1 + kind: IpRangeClaim + metadata: + name: iprangeclaim-ipv4-restore-1 + spec: + preserveInNetbox: false + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: IpRange + metadata: + name: iprangeclaim-ipv4-restore-1 + status: + (conditions[?type == 'Ready']): + - observedGeneration: 2 + status: 'True' - name: Cleanup events and leases description: Events cleanup required to fix issues with failing tests that assert the wrong Error resource and lease cleanup for preventing delays when using the same prefixes (e.g. with "invalid" tests) cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-restore-1 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-restore-2 -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-restore-1 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-restore-2 -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/netbox_v1_iprangeclaim_1.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/netbox_v1_iprangeclaim_1.yaml index 34babb25..c150e949 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/netbox_v1_iprangeclaim_1.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/netbox_v1_iprangeclaim_1.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/netbox_v1_iprangeclaim_2.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/netbox_v1_iprangeclaim_2.yaml index 5045aadc..1f062c7e 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/netbox_v1_iprangeclaim_2.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/netbox_v1_iprangeclaim_2.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-update-ownerreference/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-update-ownerreference/chainsaw-test.yaml new file mode 100644 index 00000000..3ce686b7 --- /dev/null +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-update-ownerreference/chainsaw-test.yaml @@ -0,0 +1,82 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + name: iprangeclaim-ipv4-update-ownerreference + annotations: + description: Tests if controller updates ownerReference if non-Claim resource existed before (e.g. from a velero backup) +spec: + steps: + - name: Apply CR 1 + try: + - apply: + file: netbox_v1_iprange_1.yaml + - name: Check non-claim CR 1 spec and status + try: + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: IpRange + metadata: + name: iprangeclaim-ipv4-update-ownerreference-1 + status: + (conditions[?type == 'Ready']): + - status: 'True' + - name: Apply CR 1 + try: + - apply: + file: netbox_v1_iprangeclaim_1.yaml + - name: Check claim CR 1 spec and status + try: + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: IpRangeClaim + metadata: + name: iprangeclaim-ipv4-update-ownerreference-1 + spec: + comments: your comments + description: some description + parentPrefix: 3.2.4.0/24 + size: 30 + tenant: MY_TENANT + status: + (conditions[?type == 'Ready']): + - status: 'True' + endAddress: 3.2.4.30/32 + endAddressDotDecimal: 3.2.4.30 + ipRangeName: iprangeclaim-ipv4-update-ownerreference-1 + ipRange: 3.2.4.1/32-3.2.4.30/32 + ipRangeDotDecimal: 3.2.4.1-3.2.4.30 + startAddress: 3.2.4.1/32 + startAddressDotDecimal: 3.2.4.1 + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: IpRange + metadata: + name: iprangeclaim-ipv4-update-ownerreference-1 + finalizers: + - iprange.netbox.dev/finalizer + ownerReferences: + - apiVersion: netbox.dev/v1 + blockOwnerDeletion: true + controller: true + kind: IpRangeClaim + name: iprangeclaim-ipv4-update-ownerreference-1 + spec: + comments: your comments + customFields: + netboxOperatorRestorationHash: 03cae1a8b295c77a1780a585b44562ed9a780807 + description: some description + endAddress: 3.2.4.30/32 + startAddress: 3.2.4.1/32 + tenant: MY_TENANT + status: + (conditions[?type == 'Ready']): + - status: 'True' + - name: Cleanup events + description: Events cleanup required to fix issues with failing tests that assert the wrong Error resource + cleanup: + - script: + content: | + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-update-ownerreference-1 -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-update-ownerreference/netbox_v1_iprange_1.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-update-ownerreference/netbox_v1_iprange_1.yaml new file mode 100644 index 00000000..b5a92911 --- /dev/null +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-update-ownerreference/netbox_v1_iprange_1.yaml @@ -0,0 +1,12 @@ +apiVersion: netbox.dev/v1 +kind: IpRange +metadata: + name: iprangeclaim-ipv4-update-ownerreference-1 +spec: + comments: your comments + customFields: + netboxOperatorRestorationHash: 03cae1a8b295c77a1780a585b44562ed9a780807 + description: some description + endAddress: 3.2.4.30/32 + startAddress: 3.2.4.1/32 + tenant: MY_TENANT diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-update-ownerreference/netbox_v1_iprangeclaim_1.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-update-ownerreference/netbox_v1_iprangeclaim_1.yaml new file mode 100644 index 00000000..af8b6fba --- /dev/null +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-update-ownerreference/netbox_v1_iprangeclaim_1.yaml @@ -0,0 +1,11 @@ +apiVersion: netbox.dev/v1 +kind: IpRangeClaim +metadata: + name: iprangeclaim-ipv4-update-ownerreference-1 +spec: + comments: your comments + description: some description + parentPrefix: 3.2.4.0/24 + preserveInNetbox: false + tenant: MY_TENANT + size: 30 diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/chainsaw-test.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/chainsaw-test.yaml index 5e06329b..108b7076 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -122,8 +121,8 @@ spec: cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-apply-update -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-apply-update -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/netbox_v1_iprangeclaim-update.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/netbox_v1_iprangeclaim-update.yaml index 402d1e2b..24aa7f31 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/netbox_v1_iprangeclaim-update.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/netbox_v1_iprangeclaim-update.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/netbox_v1_iprangeclaim.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/netbox_v1_iprangeclaim.yaml index a9b0431c..369e771b 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/netbox_v1_iprangeclaim.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/netbox_v1_iprangeclaim.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/chainsaw-test.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/chainsaw-test.yaml index 3239dcfc..82dc3a01 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -128,7 +127,7 @@ spec: size: 30 tenant: MY_TENANT status: - (conditions[?type == 'IPRangeAssigned']): # TODO(jstudler): Change this to Ready, will need change in SetConditionAndCreateEvent to also update Ready condition + (conditions[?type == 'IPRangeAssigned']): # TODO(jstudler): Change this to Ready, will need change in SetConditionAndCreateEvent to also update Ready condition - status: 'False' - assert: resource: @@ -148,10 +147,10 @@ spec: cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-prefixexhausted-1 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-prefixexhausted-2 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-prefixexhausted-3 -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-prefixexhausted-1 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-prefixexhausted-2 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-prefixexhausted-3 -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_1.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_1.yaml index 8a8320e6..af3bf2f7 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_1.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_1.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_2.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_2.yaml index ed30ba38..19bd62ea 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_2.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_2.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_3.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_3.yaml index 555a2c4c..c734ff84 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_3.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/netbox_v1_iprangeclaim_3.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/chainsaw-test.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/chainsaw-test.yaml index d76e65f6..aa3c07c3 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/chainsaw-test.yaml @@ -1,4 +1,3 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: Test metadata: @@ -51,7 +50,7 @@ spec: spec: comments: your comments customFields: - netboxOperatorRestorationHash: 63e120bdabdb0f18598573f1c7f068e03bfcae62 # note that this will require the tests to run in the e2e namespace! + netboxOperatorRestorationHash: 63e120bdabdb0f18598573f1c7f068e03bfcae62 # note that this will require the tests to run in the e2e namespace! description: some description startAddress: 3:2:2::1/128 endAddress: 3:2:2::1e/128 @@ -163,7 +162,7 @@ spec: spec: comments: your comments customFields: - netboxOperatorRestorationHash: 63e120bdabdb0f18598573f1c7f068e03bfcae62 # note that this will require the tests to run in the e2e namespace! + netboxOperatorRestorationHash: 63e120bdabdb0f18598573f1c7f068e03bfcae62 # note that this will require the tests to run in the e2e namespace! description: some description startAddress: 3:2:2::1/128 endAddress: 3:2:2::1e/128 @@ -175,32 +174,32 @@ spec: - name: Set preserveInNetbox to false description: Set preserveInNetbox to false to clean up the NetBox test instance try: - - patch: - resource: - apiVersion: netbox.dev/v1 - kind: IpRangeClaim - metadata: - name: iprangeclaim-ipv6-restore-1 - spec: - preserveInNetbox: false - - assert: - resource: - apiVersion: netbox.dev/v1 - kind: IpRange - metadata: - name: iprangeclaim-ipv6-restore-1 - status: - (conditions[?type == 'Ready']): - - observedGeneration: 2 - status: 'True' + - patch: + resource: + apiVersion: netbox.dev/v1 + kind: IpRangeClaim + metadata: + name: iprangeclaim-ipv6-restore-1 + spec: + preserveInNetbox: false + - assert: + resource: + apiVersion: netbox.dev/v1 + kind: IpRange + metadata: + name: iprangeclaim-ipv6-restore-1 + status: + (conditions[?type == 'Ready']): + - observedGeneration: 2 + status: 'True' - name: Cleanup events and leases description: Events cleanup required to fix issues with failing tests that assert the wrong Error resource and lease cleanup for preventing delays when using the same prefixes (e.g. with "invalid" tests) cleanup: - script: content: | - LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker - if [ -n "$LEASES" ]; then - echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete - fi - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-restore-1 -n $NAMESPACE - kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-restore-2 -n $NAMESPACE + LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker + if [ -n "$LEASES" ]; then + echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete + fi + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-restore-1 -n $NAMESPACE + kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-restore-2 -n $NAMESPACE diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/netbox_v1_iprangeclaim_1.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/netbox_v1_iprangeclaim_1.yaml index 7c9b8c3a..6175ca54 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/netbox_v1_iprangeclaim_1.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/netbox_v1_iprangeclaim_1.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/netbox_v1_iprangeclaim_2.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/netbox_v1_iprangeclaim_2.yaml index fe04b36e..7a378141 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/netbox_v1_iprangeclaim_2.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/netbox_v1_iprangeclaim_2.yaml @@ -1,4 +1,3 @@ ---- apiVersion: netbox.dev/v1 kind: IpRangeClaim metadata: diff --git a/tests/e2e/kind-config.yaml b/tests/e2e/kind-config.yaml index 42c6a320..eb2557ce 100644 --- a/tests/e2e/kind-config.yaml +++ b/tests/e2e/kind-config.yaml @@ -2,8 +2,7 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 name: kind - nodes: -- role: control-plane -- role: worker -- role: worker + - role: control-plane + - role: worker + - role: worker