Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(kubernetes): safe lookups for apiVersion on patch manifest deploy… #6775

Merged
merged 3 commits into from
Mar 29, 2019
Merged

fix(kubernetes): safe lookups for apiVersion on patch manifest deploy… #6775

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce3eb9b
fix(kubernetes): safe lookups for apiVersion on patch manifest deploy…
maggieneterval Mar 28, 2019
a05b0ca
Merge branch 'master' into fix-patch-deploy-status
maggieneterval Mar 28, 2019
fb24d17
Merge branch 'master' into fix-patch-deploy-status
maggieneterval Mar 29, 2019
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
32 changes: 23 additions & 9 deletions app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/react/DeployStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,24 @@ import { KubernetesManifestService } from 'kubernetes/v2/manifest/manifest.servi
import { ManifestStatus } from './ManifestStatus';

// from https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.12/
const BUILT_IN_GROUPS = ['', 'core', 'batch', 'apps', 'extensions', 'storage.k8s.io',
'apiextensions.k8s.io', 'apiregistration.k8s.io', 'policy', 'scheduling.k8s.io',
'settings.k8s.io', 'authorization.k8s.io', 'authentication.k8s.io', 'rbac.authorization.k8s.io',
'certifcates.k8s.io', 'networking.k8s.io']
const BUILT_IN_GROUPS = [
'',
'core',
'batch',
'apps',
'extensions',
'storage.k8s.io',
'apiextensions.k8s.io',
'apiregistration.k8s.io',
'policy',
'scheduling.k8s.io',
'settings.k8s.io',
'authorization.k8s.io',
'authentication.k8s.io',
'rbac.authorization.k8s.io',
'certifcates.k8s.io',
'networking.k8s.io',
];

export interface IManifestSubscription {
id: string;
Expand Down Expand Up @@ -94,19 +108,19 @@ export class DeployStatus extends React.Component<IExecutionDetailsSectionProps,
// manifest.metadata.namespace doesn't exist if it's a namespace being deployed
const namespace = (manifest.metadata.namespace || '_').toLowerCase();
const name = manifest.metadata.name.toLowerCase();
const apiVersion = manifest.apiVersion.toLowerCase();
const apiVersion = (manifest.apiVersion || '_').toLowerCase();
// assuming this identifier is opaque and not parsed anywhere. Including the
// apiVersion will prevent collisions with CRD kinds without having any visible
// effect elsewhere
return `${namespace} ${kind} ${apiVersion} ${name}`;
}

private apiGroup(manifest: IStageManifest): string {
const parts = manifest.apiVersion.split('/');
const parts = (manifest.apiVersion || '_').split('/');
if (parts.length < 2) {
return ''
return '';
}
return parts[0]
return parts[0];
}

private isCRDGroup(manifest: IStageManifest): boolean {
Expand All @@ -118,7 +132,7 @@ export class DeployStatus extends React.Component<IExecutionDetailsSectionProps,
return upperFirst(manifest.kind) + '.' + this.apiGroup(manifest);
}

return upperFirst(manifest.kind)
return upperFirst(manifest.kind);
}

private stageManifestToIManifest(manifest: IStageManifest, account: string): IManifest {
Expand Down