@spinnaker/docker 2025.0.6 → 2025.1.0

package/src/image/DockerImageReader.ts

@@ -40,3 +40,36 @@ export class DockerImageReader {
       .catch((): string[] => []);
   }
 }
+
+export class DockerChartImageReader {
+  public static getImage(imageName: string, region: string, credentials: string): PromiseLike<IDockerImage> {
+    return REST('/charts')
+      .path(credentials, region, imageName)
+      .query({ provider: 'docker' })
+      .get()
+      .then((results: IDockerImage[]) => (results && results.length ? results[0] : null))
+      .catch((): IDockerImage => null);
+  }
+
+  public static findImages(params: IFindImageParams): PromiseLike<IDockerImage[]> {
+    return RetryService.buildRetrySequence<IDockerImage[]>(
+      () => REST('/charts/find').query(params).get(),
+      (results: IDockerImage[]) => results.length > 0,
+      10,
+      1000,
+    )
+      .then((results: IDockerImage[]) => results)
+      .catch((): IDockerImage[] => []);
+  }
+
+  public static findTags(params: IFindTagsParams): PromiseLike<string[]> {
+    return RetryService.buildRetrySequence<string[]>(
+      () => REST('/charts/tags').query(params).get(),
+      (results: string[]) => results.length > 0,
+      10,
+      1000,
+    )
+      .then((results: string[]) => results)
+      .catch((): string[] => []);
+  }
+}

package/src/pipeline/trigger/DockerHelmOciTriggerConfig.tsx

@@ -0,0 +1,39 @@
+import type { FormikProps } from 'formik';
+import React from 'react';
+
+import type { IDockerTrigger } from '@spinnaker/core';
+import type { IDockerChartAndTagChanges } from '../../image/DockerChartAndTagSelector';
+import { DockerChartAndTagSelector } from '../../image/DockerChartAndTagSelector';
+
+export interface IDockerTriggerConfigProps {
+  formik: FormikProps<IDockerTrigger>;
+  triggerUpdated: (trigger: IDockerTrigger) => void;
+}
+
+export function DockerHelmOciTriggerConfig(props: IDockerTriggerConfigProps) {
+  const { formik } = props;
+  const trigger = formik.values;
+
+  const dockerChanged = (changes: IDockerChartAndTagChanges) => {
+    // Trigger doesn't use imageId.
+    const { imageId, ...rest } = changes;
+    props.triggerUpdated(rest as IDockerTrigger);
+  };
+
+  return (
+    <div className="form-horizontal">
+      <DockerChartAndTagSelector
+        allowManualDefinition={false}
+        specifyTagByRegex={true}
+        account={trigger.account}
+        organization={trigger.organization}
+        registry={trigger.registry}
+        repository={trigger.repository}
+        tag={trigger.tag}
+        showRegistry={true}
+        onChange={dockerChanged}
+        showDigest={false}
+      />
+    </div>
+  );
+}

package/src/pipeline/trigger/DockerTrigger.tsx

@@ -3,6 +3,7 @@ import React from 'react';
 import type { IDockerTrigger, IExecutionTriggerStatusComponentProps } from '@spinnaker/core';
 import { Registry } from '@spinnaker/core';
 
+import { DockerHelmOciTriggerConfig } from './DockerHelmOciTriggerConfig';
 import { DockerTriggerConfig } from './DockerTriggerConfig';
 import { DockerTriggerTemplate } from './DockerTriggerTemplate';
 
@@ -42,3 +43,31 @@ Registry.pipeline.registerTrigger({
     },
   ],
 });
+
+Registry.pipeline.registerTrigger({
+  label: 'Helm Docker Registry',
+  description: 'Executes the pipeline on an helm/image update',
+  key: 'helm/oci',
+  component: DockerHelmOciTriggerConfig,
+  manualExecutionComponent: DockerTriggerTemplate,
+  executionStatusComponent: DockerTriggerExecutionStatus,
+  executionTriggerLabel: () => 'Helm Docker Registry',
+  validators: [
+    {
+      type: 'requiredField',
+      fieldName: 'account',
+      message: '<strong>Registry</strong> is a required field for Docker Registry triggers.',
+    },
+    {
+      type: 'requiredField',
+      fieldName: 'repository',
+      message: '<strong>Image</strong> is a required field for Docker Registry triggers.',
+    },
+    {
+      type: 'serviceAccountAccess',
+      preventSave: true,
+      message: `You do not have access to the service account configured in this pipeline's Docker Registry trigger.
+                You will not be able to save your edits to this pipeline.`,
+    },
+  ],
+});

package/src/pipeline/trigger/DockerTriggerTemplate.tsx

@@ -10,6 +10,7 @@ import type { IDockerTrigger, IPipelineCommand, ITriggerTemplateComponentProps }
 import { HelpField, Spinner, TetheredSelect } from '@spinnaker/core';
 
 import type { IDockerLookupType } from '../../image';
+import { DockerChartImageReader } from '../../image';
 import { DockerImageReader } from '../../image';
 
 const lookupTypeOptions = [
@@ -51,13 +52,23 @@ export class DockerTriggerTemplate extends React.Component<
 
   private handleQuery = () => {
     const trigger = this.props.command.trigger as IDockerTrigger;
-    return observableFrom(
-      DockerImageReader.findTags({
-        provider: 'dockerRegistry',
-        account: trigger.account,
-        repository: trigger.repository,
-      }),
-    );
+    if (trigger.type === 'helm/oci') {
+      return observableFrom(
+        DockerChartImageReader.findTags({
+          provider: 'dockerRegistry', // Use helmOci provider for Helm OCI triggers
+          account: trigger.account,
+          repository: trigger.repository,
+        }),
+      );
+    } else {
+      return observableFrom(
+        DockerImageReader.findTags({
+          provider: 'dockerRegistry',
+          account: trigger.account,
+          repository: trigger.repository,
+        }),
+      );
+    }
   };
 
   private lookupTypeChanged = (o: Option<IDockerLookupType>) => {
@@ -82,10 +93,12 @@ export class DockerTriggerTemplate extends React.Component<
       } else {
         imageReference = `${imageName}:${tagOrDigest}`;
       }
+      // Use 'helm/image' artifact type for helm/oci triggers, otherwise use 'docker/image'
+      const artifactType = trigger.type === 'docker' ? 'docker/image' : 'helm/image';
 
       this.props.updateCommand('extraFields.artifacts', [
         {
-          type: 'docker/image',
+          type: artifactType,
           name: imageName,
           version: tagOrDigest,
           reference: imageReference,
@@ -142,7 +155,7 @@ export class DockerTriggerTemplate extends React.Component<
     }
 
     // cancel search stream if trigger has changed to some other type
-    if (command.trigger.type !== 'docker') {
+    if (command.trigger.type !== 'docker' && command.trigger.type !== 'helm/oci') {
       return;
     }