Skip to content

Commit db2e7b4

Browse files
rawagnerrawagner
authored
Merge pull request #323 from celdrake/EDM-1271-removal-of-fleet-overlapping-selectors
EDM-1271: Updates for removal of FleetOverlappingSelectors condition
2 parents c0df0fb + 80f7f26 commit db2e7b4

15 files changed

Lines changed: 223 additions & 120 deletions

File tree

‎libs/i18n/locales/en/translation.json‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,10 @@
147147
"CPU pressure": "CPU pressure",
148148
"Disk pressure": "Disk pressure",
149149
"Memory pressure": "Memory pressure",
150-
"Device is owned by more than one fleet": "Device is owned by more than one fleet",
151-
"Device labels don't match any fleet's selector labels": "Device labels don't match any fleet's selector labels",
152-
"Multiple owners": "Multiple owners",
153150
"None": "None",
151+
"Device labels don't match any fleet's selector labels": "Device labels don't match any fleet's selector labels",
154152
"Ownership information": "Ownership information",
153+
"Device is owned by more than one fleet:": "Device is owned by more than one fleet:",
155154
"System image mismatch": "System image mismatch",
156155
"Desired system image: {{ desiredOsImage }}": "Desired system image: {{ desiredOsImage }}",
157156
"Connection was closed": "Connection was closed",
@@ -328,7 +327,6 @@
328327
"{{ resourceType }} could not be deleted": "{{ resourceType }} could not be deleted",
329328
"{{ resourceType }} was updated successfully": "{{ resourceType }} was updated successfully",
330329
"{{ resourceType }} could not be updated": "{{ resourceType }} could not be updated",
331-
"Git resource change detected": "Git resource change detected",
332330
"Device decommissioned successfully": "Device decommissioned successfully",
333331
"Device could not be decommissioned": "Device could not be decommissioned",
334332
"CPU utilization has returned to normal": "CPU utilization has returned to normal",
@@ -345,22 +343,29 @@
345343
"Some application workloads are in error state": "Some application workloads are in error state",
346344
"Device reconnected": "Device reconnected",
347345
"Device is disconnected": "Device is disconnected",
346+
"Device is rebooting": "Device is rebooting",
348347
"Device returned to being up-to-date": "Device returned to being up-to-date",
349348
"Device is updating": "Device is updating",
350349
"Device is out-of-date": "Device is out-of-date",
351350
"Detected device ownership conflict": "Detected device ownership conflict",
352351
"Device ownership conflict has been resolved": "Device ownership conflict has been resolved",
353352
"Device specification has returned to a valid state": "Device specification has returned to a valid state",
354353
"Device specification is invalid": "Device specification is invalid",
355-
"Device ownership changed": "Device ownership changed",
356354
"Enrollment request was approved": "Enrollment request was approved",
357355
"Enrollment request approval failed": "Enrollment request approval failed",
358356
"Internal task failed": "Internal task failed",
359357
"Repository is accessible": "Repository is accessible",
360358
"Repository is inaccessible": "Repository is inaccessible",
361-
"Fleet selector processing completed": "Fleet selector processing completed",
362-
"Fleet reconciled": "Fleet reconciled",
363-
"Fleet reconciliation failed": "Fleet reconciliation failed",
359+
"Fleet rollout started": "Fleet rollout started",
360+
"Fleet rollout created": "Fleet rollout created",
361+
"Fleet rollout batch completed": "Fleet rollout batch completed",
362+
"Resourcesync synchronization completed": "Resourcesync synchronization completed",
363+
"Resourcesync synchronization failed": "Resourcesync synchronization failed",
364+
"Resourcesync parsed successfully": "Resourcesync parsed successfully",
365+
"Resourcesync parsing failed": "Resourcesync parsing failed",
366+
"Resourcesync is accessible": "Resourcesync is accessible",
367+
"Resourcesync is not accessible": "Resourcesync is not accessible",
368+
"Resourcesync new commit detected": "Resourcesync new commit detected",
364369
"Resource": "Resource",
365370
"Review": "Review",
366371
"Review and create": "Review and create",
@@ -752,11 +757,9 @@
752757
"Pending approval": "Pending approval",
753758
"Approved": "Approved",
754759
"Denied": "Denied",
755-
"Selectors overlap": "Selectors overlap",
756760
"Valid": "Valid",
757761
"Invalid": "Invalid",
758762
"Sync pending": "Sync pending",
759-
"Fleet's selector overlaps with at least one other fleet, causing ambiguous device ownership.": "Fleet's selector overlaps with at least one other fleet, causing ambiguous device ownership.",
760763
"Waiting for first sync": "Waiting for first sync",
761764
"Last rollout did not complete successfully": "Last rollout did not complete successfully",
762765
"Synced": "Synced",

‎libs/types/index.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ export { FileOperation } from './models/FileOperation';
8080
export type { FileSpec } from './models/FileSpec';
8181
export type { Fleet } from './models/Fleet';
8282
export type { FleetList } from './models/FleetList';
83+
export { FleetRolloutStartedDetails } from './models/FleetRolloutStartedDetails';
8384
export type { FleetRolloutStatus } from './models/FleetRolloutStatus';
84-
export { FleetSelectorProcessingCompletedDetails } from './models/FleetSelectorProcessingCompletedDetails';
8585
export type { FleetSpec } from './models/FleetSpec';
8686
export type { FleetStatus } from './models/FleetStatus';
8787
export type { GenericRepoSpec } from './models/GenericRepoSpec';
@@ -110,6 +110,9 @@ export type { MatchExpressions } from './models/MatchExpressions';
110110
export type { MemoryResourceMonitorSpec } from './models/MemoryResourceMonitorSpec';
111111
export type { ObjectMeta } from './models/ObjectMeta';
112112
export type { ObjectReference } from './models/ObjectReference';
113+
export type { Organization } from './models/Organization';
114+
export type { OrganizationList } from './models/OrganizationList';
115+
export type { OrganizationSpec } from './models/OrganizationSpec';
113116
export type { PatchRequest } from './models/PatchRequest';
114117
export type { Percentage } from './models/Percentage';
115118
export type { RelativePath } from './models/RelativePath';
@@ -124,6 +127,7 @@ export { ResourceKind } from './models/ResourceKind';
124127
export type { ResourceMonitor } from './models/ResourceMonitor';
125128
export type { ResourceMonitorSpec } from './models/ResourceMonitorSpec';
126129
export type { ResourceSync } from './models/ResourceSync';
130+
export type { ResourceSyncCompletedDetails } from './models/ResourceSyncCompletedDetails';
127131
export type { ResourceSyncList } from './models/ResourceSyncList';
128132
export type { ResourceSyncSpec } from './models/ResourceSyncSpec';
129133
export type { ResourceSyncStatus } from './models/ResourceSyncStatus';

‎libs/types/models/Event.ts‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export namespace Event {
4747
RESOURCE_UPDATE_FAILED = 'ResourceUpdateFailed',
4848
RESOURCE_DELETED = 'ResourceDeleted',
4949
RESOURCE_DELETION_FAILED = 'ResourceDeletionFailed',
50-
GIT_RESOURCE_CHANGE_DETECTED = 'GitResourceChangeDetected',
5150
DEVICE_DECOMMISSIONED = 'DeviceDecommissioned',
5251
DEVICE_DECOMMISSION_FAILED = 'DeviceDecommissionFailed',
5352
DEVICE_CPUCRITICAL = 'DeviceCPUCritical',
@@ -63,23 +62,30 @@ export namespace Event {
6362
DEVICE_APPLICATION_DEGRADED = 'DeviceApplicationDegraded',
6463
DEVICE_APPLICATION_HEALTHY = 'DeviceApplicationHealthy',
6564
DEVICE_DISCONNECTED = 'DeviceDisconnected',
65+
DEVICE_IS_REBOOTING = 'DeviceIsRebooting',
6666
DEVICE_CONNECTED = 'DeviceConnected',
6767
DEVICE_CONTENT_UP_TO_DATE = 'DeviceContentUpToDate',
6868
DEVICE_CONTENT_OUT_OF_DATE = 'DeviceContentOutOfDate',
6969
DEVICE_CONTENT_UPDATING = 'DeviceContentUpdating',
7070
ENROLLMENT_REQUEST_APPROVED = 'EnrollmentRequestApproved',
7171
ENROLLMENT_REQUEST_APPROVAL_FAILED = 'EnrollmentRequestApprovalFailed',
72-
DEVICE_OWNERSHIP_CHANGED = 'DeviceOwnershipChanged',
7372
DEVICE_MULTIPLE_OWNERS_DETECTED = 'DeviceMultipleOwnersDetected',
7473
DEVICE_MULTIPLE_OWNERS_RESOLVED = 'DeviceMultipleOwnersResolved',
7574
DEVICE_SPEC_VALID = 'DeviceSpecValid',
7675
DEVICE_SPEC_INVALID = 'DeviceSpecInvalid',
7776
INTERNAL_TASK_FAILED = 'InternalTaskFailed',
78-
FLEET_SELECTOR_PROCESSING_COMPLETED = 'FleetSelectorProcessingCompleted',
79-
FLEET_RECONCILED = 'FleetReconciled',
80-
FLEET_RECONCILE_FAILED = 'FleetReconcileFailed',
8177
REPOSITORY_ACCESSIBLE = 'RepositoryAccessible',
8278
REPOSITORY_INACCESSIBLE = 'RepositoryInaccessible',
79+
FLEET_ROLLOUT_STARTED = 'FleetRolloutStarted',
80+
FLEET_ROLLOUT_CREATED = 'FleetRolloutCreated',
81+
FLEET_ROLLOUT_BATCH_COMPLETED = 'FleetRolloutBatchCompleted',
82+
RESOURCE_SYNC_COMMIT_DETECTED = 'ResourceSyncCommitDetected',
83+
RESOURCE_SYNC_ACCESSIBLE = 'ResourceSyncAccessible',
84+
RESOURCE_SYNC_INACCESSIBLE = 'ResourceSyncInaccessible',
85+
RESOURCE_SYNC_PARSED = 'ResourceSyncParsed',
86+
RESOURCE_SYNC_PARSING_FAILED = 'ResourceSyncParsingFailed',
87+
RESOURCE_SYNC_SYNCED = 'ResourceSyncSynced',
88+
RESOURCE_SYNC_SYNC_FAILED = 'ResourceSyncSyncFailed',
8389
}
8490
/**
8591
* The type of the event. One of Normal, Warning.
@@ -89,3 +95,4 @@ export namespace Event {
8995
WARNING = 'Warning',
9096
}
9197
}
98+

‎libs/types/models/EventDetails.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
import type { DeviceMultipleOwnersDetectedDetails } from './DeviceMultipleOwnersDetectedDetails';
66
import type { DeviceMultipleOwnersResolvedDetails } from './DeviceMultipleOwnersResolvedDetails';
77
import type { DeviceOwnershipChangedDetails } from './DeviceOwnershipChangedDetails';
8-
import type { FleetSelectorProcessingCompletedDetails } from './FleetSelectorProcessingCompletedDetails';
8+
import type { FleetRolloutStartedDetails } from './FleetRolloutStartedDetails';
99
import type { InternalTaskFailedDetails } from './InternalTaskFailedDetails';
10+
import type { ResourceSyncCompletedDetails } from './ResourceSyncCompletedDetails';
1011
import type { ResourceUpdatedDetails } from './ResourceUpdatedDetails';
1112
/**
1213
* Event-specific details, structured based on event type.
1314
*/
14-
export type EventDetails = (ResourceUpdatedDetails | DeviceOwnershipChangedDetails | DeviceMultipleOwnersDetectedDetails | DeviceMultipleOwnersResolvedDetails | InternalTaskFailedDetails | FleetSelectorProcessingCompletedDetails);
15+
export type EventDetails = (ResourceUpdatedDetails | DeviceOwnershipChangedDetails | DeviceMultipleOwnersDetectedDetails | DeviceMultipleOwnersResolvedDetails | InternalTaskFailedDetails | ResourceSyncCompletedDetails | FleetRolloutStartedDetails);
1516

‎libs/types/models/FleetRolloutStartedDetails.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/* generated using openapi-typescript-codegen -- do no edit */
2+
/* istanbul ignore file */
3+
/* tslint:disable */
4+
/* eslint-disable */
5+
export type FleetRolloutStartedDetails = {
6+
/**
7+
* The type of detail for discriminator purposes.
8+
*/
9+
detailType: 'FleetRolloutStarted';
10+
/**
11+
* The name of the TemplateVersion that is rolling out.
12+
*/
13+
templateVersion: string;
14+
/**
15+
* Rollout strategy type.
16+
*/
17+
isImmediate: FleetRolloutStartedDetails.isImmediate;
18+
};
19+
export namespace FleetRolloutStartedDetails {
20+
/**
21+
* Rollout strategy type.
22+
*/
23+
export enum isImmediate {
24+
BATCHED = 'batched',
25+
IMMEDIATE = 'immediate',
26+
}
27+
}
28+

‎libs/types/models/FleetSelectorProcessingCompletedDetails.ts‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎libs/types/models/Organization.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* generated using openapi-typescript-codegen -- do no edit */
2+
/* istanbul ignore file */
3+
/* tslint:disable */
4+
/* eslint-disable */
5+
import type { ObjectMeta } from './ObjectMeta';
6+
import type { OrganizationSpec } from './OrganizationSpec';
7+
export type Organization = {
8+
/**
9+
* 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.
10+
*/
11+
apiVersion: string;
12+
/**
13+
* 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.
14+
*/
15+
kind: string;
16+
metadata: ObjectMeta;
17+
spec?: OrganizationSpec;
18+
};
19+

‎libs/types/models/OrganizationList.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/* generated using openapi-typescript-codegen -- do no edit */
2+
/* istanbul ignore file */
3+
/* tslint:disable */
4+
/* eslint-disable */
5+
import type { ListMeta } from './ListMeta';
6+
import type { Organization } from './Organization';
7+
/**
8+
* OrganizationList is a list of Organizations.
9+
*/
10+
export type OrganizationList = {
11+
/**
12+
* 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.
13+
*/
14+
apiVersion: string;
15+
/**
16+
* 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.
17+
*/
18+
kind: string;
19+
metadata: ListMeta;
20+
/**
21+
* List of Organizations.
22+
*/
23+
items: Array<Organization>;
24+
};
25+

‎libs/types/models/OrganizationSpec.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/* generated using openapi-typescript-codegen -- do no edit */
2+
/* istanbul ignore file */
3+
/* tslint:disable */
4+
/* eslint-disable */
5+
/**
6+
* OrganizationSpec describes an organization.
7+
*/
8+
export type OrganizationSpec = {
9+
/**
10+
* Human readable name shown to users.
11+
*/
12+
displayName?: string;
13+
/**
14+
* External ID of the organization.
15+
*/
16+
externalId?: string;
17+
};
18+

‎libs/types/models/ResourceSyncCompletedDetails.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/* generated using openapi-typescript-codegen -- do no edit */
2+
/* istanbul ignore file */
3+
/* tslint:disable */
4+
/* eslint-disable */
5+
export type ResourceSyncCompletedDetails = {
6+
/**
7+
* The type of detail for discriminator purposes.
8+
*/
9+
detailType: 'ResourceSyncCompleted';
10+
/**
11+
* Hash of the last commit.
12+
*/
13+
commitHash: string;
14+
/**
15+
* Number of changes introduced by this ResourceSync update.
16+
*/
17+
changeCount: number;
18+
/**
19+
* Number of errors encountered by this ResourceSync update.
20+
*/
21+
errorCount: number;
22+
};
23+

0 commit comments

Comments
 (0)