From 3fecb444163fd169bb21dd6b14ce678fda928f43 Mon Sep 17 00:00:00 2001 From: opudrovs Date: Thu, 20 Jul 2023 13:09:47 +0200 Subject: [PATCH 1/4] Add `HelmChart` to known object Kinds when getting Flux objects for syncing. --- core/server/sync.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/server/sync.go b/core/server/sync.go index bf92efa7f5..e7f4ceb6ec 100644 --- a/core/server/sync.go +++ b/core/server/sync.go @@ -128,6 +128,8 @@ func getFluxObject(kind string) (fluxsync.Reconcilable, error) { return &fluxsync.GitRepositoryAdapter{GitRepository: &sourcev1.GitRepository{}}, nil case sourcev1.BucketKind: return &fluxsync.BucketAdapter{Bucket: &sourcev1.Bucket{}}, nil + case sourcev1.HelmChartKind: + return &fluxsync.HelmChartAdapter{HelmChart: &sourcev1.HelmChart{}}, nil case sourcev1.HelmRepositoryKind: return &fluxsync.HelmRepositoryAdapter{HelmRepository: &sourcev1.HelmRepository{}}, nil case sourcev1.OCIRepositoryKind: From 797eb7b89ab3d0eabaff14db172aea116a1c75ab Mon Sep 17 00:00:00 2001 From: opudrovs Date: Fri, 21 Jul 2023 15:13:33 +0200 Subject: [PATCH 2/4] Add missing sync tests to cover all source objects. Reorder tests for consistency (automations first, then sources). --- core/server/sync_test.go | 125 ++++++++++++++++++++++++++++++++------- 1 file changed, 103 insertions(+), 22 deletions(-) diff --git a/core/server/sync_test.go b/core/server/sync_test.go index 25ba3aba23..d4ced92724 100644 --- a/core/server/sync_test.go +++ b/core/server/sync_test.go @@ -48,18 +48,41 @@ func TestSync(t *testing.T) { helmRepo := makeHelmRepo(name, *ns) hr := makeHelmRelease(name, *ns, helmRepo, chart) - g.Expect(k.Create(ctx, gitRepo)).Should(Succeed()) + bucket := makeBucket(name, *ns) + ociRepo := makeOCIRepo(name, *ns) + g.Expect(k.Create(ctx, kust)).Should(Succeed()) + g.Expect(k.Create(ctx, hr)).Should(Succeed()) + + g.Expect(k.Create(ctx, bucket)).Should(Succeed()) g.Expect(k.Create(ctx, chart)).Should(Succeed()) g.Expect(k.Create(ctx, helmRepo)).Should(Succeed()) - g.Expect(k.Create(ctx, hr)).Should(Succeed()) + g.Expect(k.Create(ctx, gitRepo)).Should(Succeed()) + g.Expect(k.Create(ctx, ociRepo)).Should(Succeed()) tests := []struct { name string msg *pb.SyncFluxObjectRequest - automation fluxsync.Automation + automation fluxsync.Reconcilable source fluxsync.Reconcilable }{{ + name: "helm release no source", + msg: &pb.SyncFluxObjectRequest{ + Objects: []*pb.ObjectRef{{ClusterName: "Default", + Kind: helmv2.HelmReleaseKind}}, + WithSource: false, + }, + automation: fluxsync.HelmReleaseAdapter{HelmRelease: hr}, + }, { + name: "helm release with source", + msg: &pb.SyncFluxObjectRequest{ + Objects: []*pb.ObjectRef{{ClusterName: "Default", + Kind: helmv2.HelmReleaseKind}}, + WithSource: true, + }, + automation: fluxsync.HelmReleaseAdapter{HelmRelease: hr}, + source: fluxsync.NewReconcileable(helmRepo), + }, { name: "kustomization no source", msg: &pb.SyncFluxObjectRequest{ Objects: []*pb.ObjectRef{{ClusterName: "Default", @@ -77,34 +100,56 @@ func TestSync(t *testing.T) { automation: fluxsync.KustomizationAdapter{Kustomization: kust}, source: fluxsync.NewReconcileable(gitRepo), }, { - name: "helm release no source", + name: "gitrepository", msg: &pb.SyncFluxObjectRequest{ Objects: []*pb.ObjectRef{{ClusterName: "Default", - Kind: helmv2.HelmReleaseKind}}, + Kind: sourcev1.GitRepositoryKind}}, WithSource: false, }, - automation: fluxsync.HelmReleaseAdapter{HelmRelease: hr}, + automation: fluxsync.GitRepositoryAdapter{GitRepository: gitRepo}, }, { - name: "helm release with source", + name: "bucket", + msg: &pb.SyncFluxObjectRequest{ + Objects: []*pb.ObjectRef{{ClusterName: "Default", + Kind: sourcev1.BucketKind}}, + WithSource: false, + }, + automation: fluxsync.BucketAdapter{Bucket: bucket}, + }, { + name: "helmchart", + msg: &pb.SyncFluxObjectRequest{ + Objects: []*pb.ObjectRef{{ClusterName: "Default", + Kind: sourcev1.HelmChartKind}}, + WithSource: false, + }, + automation: fluxsync.HelmChartAdapter{HelmChart: chart}, + }, { + name: "helmrepository", + msg: &pb.SyncFluxObjectRequest{ + Objects: []*pb.ObjectRef{{ClusterName: "Default", + Kind: sourcev1.HelmRepositoryKind}}, + WithSource: false, + }, + automation: fluxsync.HelmRepositoryAdapter{HelmRepository: helmRepo}, + }, { + name: "ocirepository", msg: &pb.SyncFluxObjectRequest{ Objects: []*pb.ObjectRef{{ClusterName: "Default", + Kind: sourcev1.OCIRepositoryKind}}, + WithSource: false, + }, + automation: fluxsync.OCIRepositoryAdapter{OCIRepository: ociRepo}, + }, { + name: "multiple objects", + msg: &pb.SyncFluxObjectRequest{ + Objects: []*pb.ObjectRef{{ClusterName: "Default", + Kind: helmv2.HelmReleaseKind}, {ClusterName: "Default", Kind: helmv2.HelmReleaseKind}}, WithSource: true, }, automation: fluxsync.HelmReleaseAdapter{HelmRelease: hr}, source: fluxsync.NewReconcileable(helmRepo), - }, - { - name: "multiple objects", - msg: &pb.SyncFluxObjectRequest{ - Objects: []*pb.ObjectRef{{ClusterName: "Default", - Kind: helmv2.HelmReleaseKind}, {ClusterName: "Default", - Kind: helmv2.HelmReleaseKind}}, - WithSource: true, - }, - automation: fluxsync.HelmReleaseAdapter{HelmRelease: hr}, - source: fluxsync.NewReconcileable(helmRepo), - }} + }} for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { @@ -161,7 +206,7 @@ func TestSync(t *testing.T) { func simulateReconcile(ctx context.Context, k client.Client, name types.NamespacedName, o client.Object) error { switch obj := o.(type) { - case *sourcev1.GitRepository: + case *helmv2.HelmRelease: if err := k.Get(ctx, name, obj); err != nil { return err } @@ -169,6 +214,7 @@ func simulateReconcile(ctx context.Context, k client.Client, name types.Namespac obj.Status.SetLastHandledReconcileRequest(time.Now().Format(time.RFC3339Nano)) return k.Status().Update(ctx, obj) + case *kustomizev1.Kustomization: if err := k.Get(ctx, name, obj); err != nil { return err @@ -178,7 +224,7 @@ func simulateReconcile(ctx context.Context, k client.Client, name types.Namespac return k.Status().Update(ctx, obj) - case *sourcev1.HelmRepository: + case *sourcev1.Bucket: if err := k.Get(ctx, name, obj); err != nil { return err } @@ -187,7 +233,7 @@ func simulateReconcile(ctx context.Context, k client.Client, name types.Namespac return k.Status().Update(ctx, obj) - case *helmv2.HelmRelease: + case *sourcev1.GitRepository: if err := k.Get(ctx, name, obj); err != nil { return err } @@ -203,6 +249,24 @@ func simulateReconcile(ctx context.Context, k client.Client, name types.Namespac obj.Status.SetLastHandledReconcileRequest(time.Now().Format(time.RFC3339Nano)) + return k.Status().Update(ctx, obj) + + case *sourcev1.HelmRepository: + if err := k.Get(ctx, name, obj); err != nil { + return err + } + + obj.Status.SetLastHandledReconcileRequest(time.Now().Format(time.RFC3339Nano)) + + return k.Status().Update(ctx, obj) + + case *sourcev1.OCIRepository: + if err := k.Get(ctx, name, obj); err != nil { + return err + } + + obj.Status.SetLastHandledReconcileRequest(time.Now().Format(time.RFC3339Nano)) + return k.Status().Update(ctx, obj) } @@ -331,3 +395,20 @@ func makeHelmRelease(name string, ns corev1.Namespace, repo *sourcev1.HelmReposi }, } } + +func makeOCIRepo(name string, ns corev1.Namespace) *sourcev1.OCIRepository { + return &sourcev1.OCIRepository{ + ObjectMeta: metav1.ObjectMeta{ + Name: name, + Namespace: ns.Name, + }, + Spec: sourcev1.OCIRepositorySpec{ + URL: "oci://ghcr.io/some/chart", + }, + Status: sourcev1.OCIRepositoryStatus{ + ReconcileRequestStatus: meta.ReconcileRequestStatus{ + LastHandledReconcileAt: time.Now().Format(time.RFC3339Nano), + }, + }, + } +} From a5a385f9c4f5c4633f5ebdfa79f204eaae0fd743 Mon Sep 17 00:00:00 2001 From: Yiannis Date: Mon, 24 Jul 2023 13:31:18 +0100 Subject: [PATCH 3/4] fix: Add missing OCIRepository CRD --- ...rce.toolkit.fluxcd.io_ocirepositories.yaml | 356 ++++++++++++++++++ 1 file changed, 356 insertions(+) create mode 100644 tools/testcrds/source.toolkit.fluxcd.io_ocirepositories.yaml diff --git a/tools/testcrds/source.toolkit.fluxcd.io_ocirepositories.yaml b/tools/testcrds/source.toolkit.fluxcd.io_ocirepositories.yaml new file mode 100644 index 0000000000..5067bb903c --- /dev/null +++ b/tools/testcrds/source.toolkit.fluxcd.io_ocirepositories.yaml @@ -0,0 +1,356 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.12.0 + name: ocirepositories.source.toolkit.fluxcd.io +spec: + group: source.toolkit.fluxcd.io + names: + kind: OCIRepository + listKind: OCIRepositoryList + plural: ocirepositories + shortNames: + - ocirepo + singular: ocirepository + scope: Namespaced + versions: + - additionalPrinterColumns: + - jsonPath: .spec.url + name: URL + type: string + - jsonPath: .status.conditions[?(@.type=="Ready")].status + name: Ready + type: string + - jsonPath: .status.conditions[?(@.type=="Ready")].message + name: Status + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1beta2 + schema: + openAPIV3Schema: + description: OCIRepository is the Schema for the ocirepositories API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: OCIRepositorySpec defines the desired state of OCIRepository + properties: + certSecretRef: + description: "CertSecretRef can be given the name of a secret containing + either or both of \n - a PEM-encoded client certificate (`certFile`) + and private key (`keyFile`); - a PEM-encoded CA certificate (`caFile`) + \n and whichever are supplied, will be used for connecting to the + registry. The client cert and key are useful if you are authenticating + with a certificate; the CA cert is useful if you are using a self-signed + server certificate." + properties: + name: + description: Name of the referent. + type: string + required: + - name + type: object + ignore: + description: Ignore overrides the set of excluded patterns in the + .sourceignore format (which is the same as .gitignore). If not provided, + a default will be used, consult the documentation for your version + to find out what those are. + type: string + insecure: + description: Insecure allows connecting to a non-TLS HTTP container + registry. + type: boolean + interval: + description: The interval at which to check for image updates. + pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ + type: string + layerSelector: + description: LayerSelector specifies which layer should be extracted + from the OCI artifact. When not specified, the first layer found + in the artifact is selected. + properties: + mediaType: + description: MediaType specifies the OCI media type of the layer + which should be extracted from the OCI Artifact. The first layer + matching this type is selected. + type: string + operation: + description: Operation specifies how the selected layer should + be processed. By default, the layer compressed content is extracted + to storage. When the operation is set to 'copy', the layer compressed + content is persisted to storage as it is. + enum: + - extract + - copy + type: string + type: object + provider: + default: generic + description: The provider used for authentication, can be 'aws', 'azure', + 'gcp' or 'generic'. When not specified, defaults to 'generic'. + enum: + - generic + - aws + - azure + - gcp + type: string + ref: + description: The OCI reference to pull and monitor for changes, defaults + to the latest tag. + properties: + digest: + description: Digest is the image digest to pull, takes precedence + over SemVer. The value should be in the format 'sha256:'. + type: string + semver: + description: SemVer is the range of tags to pull selecting the + latest within the range, takes precedence over Tag. + type: string + tag: + description: Tag is the image tag to pull, defaults to latest. + type: string + type: object + secretRef: + description: SecretRef contains the secret name containing the registry + login credentials to resolve image metadata. The secret must be + of type kubernetes.io/dockerconfigjson. + properties: + name: + description: Name of the referent. + type: string + required: + - name + type: object + serviceAccountName: + description: 'ServiceAccountName is the name of the Kubernetes ServiceAccount + used to authenticate the image pull if the service account has attached + pull secrets. For more information: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#add-imagepullsecrets-to-a-service-account' + type: string + suspend: + description: This flag tells the controller to suspend the reconciliation + of this source. + type: boolean + timeout: + default: 60s + description: The timeout for remote OCI Repository operations like + pulling, defaults to 60s. + pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$ + type: string + url: + description: URL is a reference to an OCI artifact repository hosted + on a remote container registry. + pattern: ^oci://.*$ + type: string + verify: + description: Verify contains the secret name containing the trusted + public keys used to verify the signature and specifies which provider + to use to check whether OCI image is authentic. + properties: + provider: + default: cosign + description: Provider specifies the technology used to sign the + OCI Artifact. + enum: + - cosign + type: string + secretRef: + description: SecretRef specifies the Kubernetes Secret containing + the trusted public keys. + properties: + name: + description: Name of the referent. + type: string + required: + - name + type: object + required: + - provider + type: object + required: + - interval + - url + type: object + status: + default: + observedGeneration: -1 + description: OCIRepositoryStatus defines the observed state of OCIRepository + properties: + artifact: + description: Artifact represents the output of the last successful + OCI Repository sync. + properties: + digest: + description: Digest is the digest of the file in the form of ':'. + pattern: ^[a-z0-9]+(?:[.+_-][a-z0-9]+)*:[a-zA-Z0-9=_-]+$ + type: string + lastUpdateTime: + description: LastUpdateTime is the timestamp corresponding to + the last update of the Artifact. + format: date-time + type: string + metadata: + additionalProperties: + type: string + description: Metadata holds upstream information such as OCI annotations. + type: object + path: + description: Path is the relative file path of the Artifact. It + can be used to locate the file in the root of the Artifact storage + on the local file system of the controller managing the Source. + type: string + revision: + description: Revision is a human-readable identifier traceable + in the origin source system. It can be a Git commit SHA, Git + tag, a Helm chart version, etc. + type: string + size: + description: Size is the number of bytes in the file. + format: int64 + type: integer + url: + description: URL is the HTTP address of the Artifact as exposed + by the controller managing the Source. It can be used to retrieve + the Artifact for consumption, e.g. by another controller applying + the Artifact contents. + type: string + required: + - lastUpdateTime + - path + - revision + - url + type: object + conditions: + description: Conditions holds the conditions for the OCIRepository. + items: + description: "Condition contains details for one aspect of the current + state of this API Resource. --- This struct is intended for direct + use as an array at the field path .status.conditions. For example, + \n type FooStatus struct{ // Represents the observations of a + foo's current state. // Known .status.conditions.type are: \"Available\", + \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge + // +listType=map // +listMapKey=type Conditions []metav1.Condition + `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" + protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }" + properties: + lastTransitionTime: + description: lastTransitionTime is the last time the condition + transitioned from one status to another. This should be when + the underlying condition changed. If that is not known, then + using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: message is a human readable message indicating + details about the transition. This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: observedGeneration represents the .metadata.generation + that the condition was set based upon. For instance, if .metadata.generation + is currently 12, but the .status.conditions[x].observedGeneration + is 9, the condition is out of date with respect to the current + state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: reason contains a programmatic identifier indicating + the reason for the condition's last transition. Producers + of specific condition types may define expected values and + meanings for this field, and whether the values are considered + a guaranteed API. The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + --- Many .condition.type values are consistent across resources + like Available, but because arbitrary conditions can be useful + (see .node.status.conditions), the ability to deconflict is + important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + contentConfigChecksum: + description: "ContentConfigChecksum is a checksum of all the configurations + related to the content of the source artifact: - .spec.ignore - + .spec.layerSelector observed in .status.observedGeneration version + of the object. This can be used to determine if the content configuration + has changed and the artifact needs to be rebuilt. It has the format + of `:`, for example: `sha256:`. \n Deprecated: + Replaced with explicit fields for observed artifact content config + in the status." + type: string + lastHandledReconcileAt: + description: LastHandledReconcileAt holds the value of the most recent + reconcile request value, so a change of the annotation value can + be detected. + type: string + observedGeneration: + description: ObservedGeneration is the last observed generation. + format: int64 + type: integer + observedIgnore: + description: ObservedIgnore is the observed exclusion patterns used + for constructing the source artifact. + type: string + observedLayerSelector: + description: ObservedLayerSelector is the observed layer selector + used for constructing the source artifact. + properties: + mediaType: + description: MediaType specifies the OCI media type of the layer + which should be extracted from the OCI Artifact. The first layer + matching this type is selected. + type: string + operation: + description: Operation specifies how the selected layer should + be processed. By default, the layer compressed content is extracted + to storage. When the operation is set to 'copy', the layer compressed + content is persisted to storage as it is. + enum: + - extract + - copy + type: string + type: object + url: + description: URL is the download link for the artifact output of the + last OCI Repository sync. + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} \ No newline at end of file From c3772e7070b367b9845b1ec2997ef0e498445e1b Mon Sep 17 00:00:00 2001 From: Yiannis Date: Tue, 25 Jul 2023 09:47:53 +0100 Subject: [PATCH 4/4] fix: Renamed parameter to better communicate usage --- core/fluxsync/adapters.go | 3 +++ core/server/sync_test.go | 40 +++++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/core/fluxsync/adapters.go b/core/fluxsync/adapters.go index fcf939ccbc..652859c452 100644 --- a/core/fluxsync/adapters.go +++ b/core/fluxsync/adapters.go @@ -31,6 +31,9 @@ type SourceRef interface { Namespace() string } +// Automation objects are Kustomizations and HelmReleases. +// These are the only object types that can be triggered +// to be reconciled with their source. type Automation interface { Reconcilable SourceRef() SourceRef diff --git a/core/server/sync_test.go b/core/server/sync_test.go index d4ced92724..522104616f 100644 --- a/core/server/sync_test.go +++ b/core/server/sync_test.go @@ -61,10 +61,10 @@ func TestSync(t *testing.T) { g.Expect(k.Create(ctx, ociRepo)).Should(Succeed()) tests := []struct { - name string - msg *pb.SyncFluxObjectRequest - automation fluxsync.Reconcilable - source fluxsync.Reconcilable + name string + msg *pb.SyncFluxObjectRequest + reconcilable fluxsync.Reconcilable + source fluxsync.Reconcilable }{{ name: "helm release no source", msg: &pb.SyncFluxObjectRequest{ @@ -72,7 +72,7 @@ func TestSync(t *testing.T) { Kind: helmv2.HelmReleaseKind}}, WithSource: false, }, - automation: fluxsync.HelmReleaseAdapter{HelmRelease: hr}, + reconcilable: fluxsync.HelmReleaseAdapter{HelmRelease: hr}, }, { name: "helm release with source", msg: &pb.SyncFluxObjectRequest{ @@ -80,8 +80,8 @@ func TestSync(t *testing.T) { Kind: helmv2.HelmReleaseKind}}, WithSource: true, }, - automation: fluxsync.HelmReleaseAdapter{HelmRelease: hr}, - source: fluxsync.NewReconcileable(helmRepo), + reconcilable: fluxsync.HelmReleaseAdapter{HelmRelease: hr}, + source: fluxsync.NewReconcileable(helmRepo), }, { name: "kustomization no source", msg: &pb.SyncFluxObjectRequest{ @@ -89,7 +89,7 @@ func TestSync(t *testing.T) { Kind: kustomizev1.KustomizationKind}}, WithSource: false, }, - automation: fluxsync.KustomizationAdapter{Kustomization: kust}, + reconcilable: fluxsync.KustomizationAdapter{Kustomization: kust}, }, { name: "kustomization with source", msg: &pb.SyncFluxObjectRequest{ @@ -97,8 +97,8 @@ func TestSync(t *testing.T) { Kind: kustomizev1.KustomizationKind}}, WithSource: true, }, - automation: fluxsync.KustomizationAdapter{Kustomization: kust}, - source: fluxsync.NewReconcileable(gitRepo), + reconcilable: fluxsync.KustomizationAdapter{Kustomization: kust}, + source: fluxsync.NewReconcileable(gitRepo), }, { name: "gitrepository", msg: &pb.SyncFluxObjectRequest{ @@ -106,7 +106,7 @@ func TestSync(t *testing.T) { Kind: sourcev1.GitRepositoryKind}}, WithSource: false, }, - automation: fluxsync.GitRepositoryAdapter{GitRepository: gitRepo}, + reconcilable: fluxsync.GitRepositoryAdapter{GitRepository: gitRepo}, }, { name: "bucket", msg: &pb.SyncFluxObjectRequest{ @@ -114,7 +114,7 @@ func TestSync(t *testing.T) { Kind: sourcev1.BucketKind}}, WithSource: false, }, - automation: fluxsync.BucketAdapter{Bucket: bucket}, + reconcilable: fluxsync.BucketAdapter{Bucket: bucket}, }, { name: "helmchart", msg: &pb.SyncFluxObjectRequest{ @@ -122,7 +122,7 @@ func TestSync(t *testing.T) { Kind: sourcev1.HelmChartKind}}, WithSource: false, }, - automation: fluxsync.HelmChartAdapter{HelmChart: chart}, + reconcilable: fluxsync.HelmChartAdapter{HelmChart: chart}, }, { name: "helmrepository", msg: &pb.SyncFluxObjectRequest{ @@ -130,7 +130,7 @@ func TestSync(t *testing.T) { Kind: sourcev1.HelmRepositoryKind}}, WithSource: false, }, - automation: fluxsync.HelmRepositoryAdapter{HelmRepository: helmRepo}, + reconcilable: fluxsync.HelmRepositoryAdapter{HelmRepository: helmRepo}, }, { name: "ocirepository", msg: &pb.SyncFluxObjectRequest{ @@ -138,7 +138,7 @@ func TestSync(t *testing.T) { Kind: sourcev1.OCIRepositoryKind}}, WithSource: false, }, - automation: fluxsync.OCIRepositoryAdapter{OCIRepository: ociRepo}, + reconcilable: fluxsync.OCIRepositoryAdapter{OCIRepository: ociRepo}, }, { name: "multiple objects", msg: &pb.SyncFluxObjectRequest{ @@ -147,16 +147,16 @@ func TestSync(t *testing.T) { Kind: helmv2.HelmReleaseKind}}, WithSource: true, }, - automation: fluxsync.HelmReleaseAdapter{HelmRelease: hr}, - source: fluxsync.NewReconcileable(helmRepo), + reconcilable: fluxsync.HelmReleaseAdapter{HelmRelease: hr}, + source: fluxsync.NewReconcileable(helmRepo), }} for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { msg := tt.msg for _, msg := range msg.Objects { - msg.Name = tt.automation.GetName() - msg.Namespace = tt.automation.GetNamespace() + msg.Name = tt.reconcilable.GetName() + msg.Namespace = tt.reconcilable.GetNamespace() } done := make(chan error) @@ -189,7 +189,7 @@ func TestSync(t *testing.T) { } an := types.NamespacedName{Name: name, Namespace: ns.Name} - if err := simulateReconcile(ctx, k, an, tt.automation.AsClientObject()); err != nil { + if err := simulateReconcile(ctx, k, an, tt.reconcilable.AsClientObject()); err != nil { t.Fatal(err) }