Cover signingKey round-trip in export tests
Extends the existing TestExport 'image update' case with a signingKey block on the seeded ImageUpdateAutomation, asserting the new field survives the kubeClient.Get + serialize path. Parallels how the existing fixture exercises every other field on the resource. Also patches the embedded CRD source under manifests/bases/image- automation-controller/ to inject the signingKey.type schema property into both v1 and v1beta2. The patch is transitional and should be removed once the image-automation-controller release bundle includes the new type field natively. Signed-off-by: Hidde Beydals <hidde@hhh.computer>
This commit is contained in:
+4
@@ -10,6 +10,10 @@ spec:
|
|||||||
author:
|
author:
|
||||||
email: fluxcdbot@users.noreply.github.com
|
email: fluxcdbot@users.noreply.github.com
|
||||||
name: fluxcdbot
|
name: fluxcdbot
|
||||||
|
signingKey:
|
||||||
|
secretRef:
|
||||||
|
name: my-signing-key
|
||||||
|
type: ssh
|
||||||
interval: 1m0s
|
interval: 1m0s
|
||||||
sourceRef:
|
sourceRef:
|
||||||
kind: GitRepository
|
kind: GitRepository
|
||||||
|
|||||||
+4
@@ -67,6 +67,10 @@ spec:
|
|||||||
email: fluxcdbot@users.noreply.github.com
|
email: fluxcdbot@users.noreply.github.com
|
||||||
name: fluxcdbot
|
name: fluxcdbot
|
||||||
messageTemplate: '{{range .Updated.Images}}{{println .}}{{end}}'
|
messageTemplate: '{{range .Updated.Images}}{{println .}}{{end}}'
|
||||||
|
signingKey:
|
||||||
|
secretRef:
|
||||||
|
name: my-signing-key
|
||||||
|
type: ssh
|
||||||
update:
|
update:
|
||||||
path: ./clusters/my-cluster
|
path: ./clusters/my-cluster
|
||||||
strategy: Setters
|
strategy: Setters
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
- op: add
|
||||||
|
path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/git/properties/commit/properties/signingKey/properties/type
|
||||||
|
value:
|
||||||
|
default: gpg
|
||||||
|
description: |-
|
||||||
|
Type selects the signing-key format expected in the referenced
|
||||||
|
Secret. Defaults to 'gpg'.
|
||||||
|
enum:
|
||||||
|
- gpg
|
||||||
|
- ssh
|
||||||
|
type: string
|
||||||
|
- op: add
|
||||||
|
path: /spec/versions/1/schema/openAPIV3Schema/properties/spec/properties/git/properties/commit/properties/signingKey/properties/type
|
||||||
|
value:
|
||||||
|
default: gpg
|
||||||
|
description: |-
|
||||||
|
Type selects the signing-key format expected in the referenced
|
||||||
|
Secret. Defaults to 'gpg'.
|
||||||
|
enum:
|
||||||
|
- gpg
|
||||||
|
- ssh
|
||||||
|
type: string
|
||||||
@@ -13,3 +13,9 @@ patches:
|
|||||||
kind: Deployment
|
kind: Deployment
|
||||||
name: image-automation-controller
|
name: image-automation-controller
|
||||||
path: patch.yaml
|
path: patch.yaml
|
||||||
|
- target:
|
||||||
|
group: apiextensions.k8s.io
|
||||||
|
version: v1
|
||||||
|
kind: CustomResourceDefinition
|
||||||
|
name: imageupdateautomations.image.toolkit.fluxcd.io
|
||||||
|
path: crd-signing-key-type-patch.yaml
|
||||||
|
|||||||
Reference in New Issue
Block a user