Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/server/lib/codefresh/__fixtures__/codefresh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ export const generateYamlOptions = {
deploy,
ecrDomain,
ecrRepo: `lfc/app/lfc`,
deployCluster: undefined,
};

export const yamlDefaults = {
Expand Down
1 change: 1 addition & 0 deletions src/server/lib/codefresh/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ export type ContainerBuildOptions = {
initTag?: string;
author?: string;
enabledFeatures?: string[];
deployCluster?: string;
};
13 changes: 13 additions & 0 deletions src/server/lib/codefresh/utils/__tests__/generateYaml.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
afterBuildStep,
generateYamlOptions,
yamlContent,
annotations,
} from 'server/lib/codefresh/__fixtures__/codefresh';
import { generateYaml } from 'server/lib/codefresh/utils/generateYaml';

Expand Down Expand Up @@ -49,6 +50,18 @@ describe('generateYaml', () => {
const result = generateYaml(generateYamlOptions);
expect(result).toEqual({
...yamlContent,
hooks: {
on_elected: {
annotations: {
set: [
{
annotations: [...annotations, { eksCluster: 'unknown' }],
display: 'deployUUID',
},
],
},
},
},
steps: {
...yamlContent.steps,
Checkout: {
Expand Down
2 changes: 2 additions & 0 deletions src/server/lib/codefresh/utils/generateYaml.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export const generateYaml = (options: ContainerBuildOptions) => {
initTag,
author,
enabledFeatures = [],
deployCluster,
} = options;
const buildArgs = constructBuildArgs(envVars);

Expand All @@ -65,6 +66,7 @@ export const generateYaml = (options: ContainerBuildOptions) => {
branch: deploy?.branchName,
repo,
author,
eksCluster: deployCluster || 'unknown',
};
const annotations = Object.keys(annotationsObj)
.filter((key) => annotationsObj[key])
Expand Down
2 changes: 2 additions & 0 deletions src/server/lib/helm/helm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ export async function generateHelmCodefreshYamlNoCheckout(deploy: Deploy): Promi
const annotationsObj = {
uuid: deploy.deployable?.buildUUID,
deployUUID: deploy.uuid,
eksCluster: configs?.lifecycleDefaults?.deployCluster || 'unknown',
};
const annotations = Object.keys(annotationsObj)
.filter((key) => annotationsObj[key])
Expand Down Expand Up @@ -387,6 +388,7 @@ export async function generateHelmCodefreshYamlWithCheckout(deploy: Deploy): Pro
const annotationsObj = {
uuid: deploy.deployable?.buildUUID,
deployUUID: deploy.uuid,
eksCluster: configs?.lifecycleDefaults?.deployCluster || 'unknown',
};
const annotations = Object.keys(annotationsObj)
.filter((key) => annotationsObj[key])
Expand Down
2 changes: 2 additions & 0 deletions src/server/services/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,7 @@ export default class DeployService extends BaseService {
author,
enabledFeatures,
ecrDomain,
deployCluster: lifecycleDefaults.deployCluster,
});
const buildLogs = `https://g.codefresh.io/build/${codefreshBuildId}`;
await this.patchAndUpdateActivityFeed(deploy, { buildLogs }, runUUID);
Expand Down Expand Up @@ -946,6 +947,7 @@ export default class DeployService extends BaseService {
initTag,
author,
enabledFeatures,
deployCluster: lifecycleDefaults.deployCluster,
};

if (['buildkit', 'kaniko'].includes(deployable.builder?.engine)) {
Expand Down