Skip to content

Commit 833748d

Browse files
author
ControlPlane CI
committed
Sync changes from upstream
1 parent 32b9d37 commit 833748d

5 files changed

Lines changed: 314 additions & 15 deletions

File tree

src/interfaces/command.ts

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ export interface RunCronWorkloadSpec {
6767
export interface RunCronWorkloadStatus {
6868
replica?: string;
6969

70+
clusterIdByLocation?: {
71+
[x: string]: string;
72+
73+
};
74+
7075
minimumWorkloadVersion?: number;
7176

7277
}
@@ -81,6 +86,11 @@ export interface StopReplicaSpec {
8186
export interface StopReplicaStatus {
8287
clusterId?: string;
8388

89+
clusterIdByLocation?: {
90+
[x: string]: string;
91+
92+
};
93+
8494
podCreatedByCommandLink?: string;
8595

8696
podId: string;
@@ -95,12 +105,14 @@ export interface ReplaceVolumeSpec {
95105
}
96106

97107
export interface RestoreVolumeSpec {
98-
location: string;
99-
100108
volumeIndex: number;
101109

110+
location: string;
111+
102112
snapshotName: string;
103113

114+
zone?: string;
115+
104116
}
105117

106118
export interface ReplaceVolumeStatus {
@@ -110,6 +122,11 @@ export interface ReplaceVolumeStatus {
110122

111123
clusterId?: string;
112124

125+
clusterIdByLocation?: {
126+
[x: string]: string;
127+
128+
};
129+
113130
inUseByWorkloadId?: string;
114131

115132
storageDeviceIdToRemove?: string;
@@ -150,6 +167,11 @@ export interface CreateVolumeSnapshotStatus {
150167

151168
clusterId?: string;
152169

170+
clusterIdByLocation?: {
171+
[x: string]: string;
172+
173+
};
174+
153175
newSnapshotId?: string;
154176

155177
newSnapshotSize?: number;
@@ -172,6 +194,11 @@ export interface ExpandVolumeSpec {
172194
export interface ExpandVolumeStatus {
173195
clusterId?: string;
174196

197+
clusterIdByLocation?: {
198+
[x: string]: string;
199+
200+
};
201+
175202
messages?: string[];
176203

177204
stage: 'expand-volume' | 'delete-stateful-set' | 'await-replica-termination' | 'await-expansion-completed' | 'update-volume-set' | 'recreate-replica' | 'cleanup-k8s' | 'revert';
@@ -205,6 +232,11 @@ export interface DeleteVolumeStatus {
205232

206233
clusterId?: string;
207234

235+
clusterIdByLocation?: {
236+
[x: string]: string;
237+
238+
};
239+
208240
messages?: string[];
209241

210242
inUseByWorkloadId?: string;
@@ -218,6 +250,11 @@ export interface DeleteOrphanedVolumeStatus {
218250

219251
clusterId?: string;
220252

253+
clusterIdByLocation?: {
254+
[x: string]: string;
255+
256+
};
257+
221258
messages?: string[];
222259

223260
}
@@ -236,6 +273,11 @@ export interface DeleteOrphanedVolumeSnapshotStatus {
236273

237274
clusterId?: string;
238275

276+
clusterIdByLocation?: {
277+
[x: string]: string;
278+
279+
};
280+
239281
messages?: string[];
240282

241283
}
@@ -250,6 +292,11 @@ export interface SnapshotDeletionStatus {
250292
export interface DeleteCloudDevicesStatus {
251293
clusterId?: string;
252294

295+
clusterIdByLocation?: {
296+
[x: string]: string;
297+
298+
};
299+
253300
volume: {
254301
lifecycle?: 'creating' | 'unused' | 'unbound' | 'bound' | 'deleted' | 'repairing';
255302

@@ -312,6 +359,11 @@ export interface DeleteVolumeSnapshotSpec {
312359
export interface DeleteVolumeSnapshotStatus {
313360
clusterId?: string;
314361

362+
clusterIdByLocation?: {
363+
[x: string]: string;
364+
365+
};
366+
315367
snapshot: {
316368
name: string;
317369

@@ -378,6 +430,8 @@ export interface DeleteVolumeSetSpec {
378430

379431
};
380432

433+
locations?: string[];
434+
381435
}
382436

383437
export interface DeleteVolumeSetLocationStatus {

src/interfaces/mk8sAddons.ts

Lines changed: 120 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,15 @@ export interface AzureACRAddonConfig {
138138

139139
}
140140

141+
export interface HttpHeaderValue {
142+
values?: string[];
143+
144+
secrets?: string[];
145+
146+
files?: string[];
147+
148+
}
149+
141150
export interface ByokAddonConfig {
142151
ignoreUpdates?: boolean;
143152

@@ -167,6 +176,10 @@ export interface ByokAddonConfig {
167176

168177
bandwidthAlertMbps?: number;
169178

179+
port?: number;
180+
181+
ip?: string;
182+
170183
};
171184

172185
common?: {
@@ -180,8 +193,17 @@ export interface ByokAddonConfig {
180193
};
181194

182195
longhorn?: {
196+
numberOfReplicas?: number;
197+
183198
replicas?: number;
184199

200+
isDefault?: boolean;
201+
202+
};
203+
204+
byok?: {
205+
noDefaultStorageClasses?: boolean;
206+
185207
};
186208

187209
ingress?: {
@@ -258,6 +280,104 @@ export interface ByokAddonConfig {
258280

259281
};
260282

283+
};
284+
285+
remoteWrite?: {
286+
basic_auth?: {
287+
username?: string;
288+
289+
username_file?: string;
290+
291+
password?: string;
292+
293+
password_file?: string;
294+
295+
};
296+
297+
authorization?: {
298+
type?: string;
299+
300+
credentials?: string;
301+
302+
credentials_file?: string;
303+
304+
};
305+
306+
oauth2?: {
307+
[x: string]: any;
308+
309+
};
310+
311+
follow_redirects?: boolean;
312+
313+
enable_http2?: boolean;
314+
315+
tls_config?: {
316+
[x: string]: any;
317+
318+
};
319+
320+
proxy_url?: string;
321+
322+
no_proxy?: string;
323+
324+
proxy_from_environment?: boolean;
325+
326+
proxy_connect_header?: {
327+
[x: string]: string[];
328+
329+
};
330+
331+
http_headers?: {
332+
[x: string]: HttpHeaderValue;
333+
334+
};
335+
336+
url?: string;
337+
338+
remote_timeout?: string;
339+
340+
headers?: {
341+
[x: string]: string;
342+
343+
};
344+
345+
write_relabel_configs?: {
346+
[x: string]: any;
347+
348+
}[];
349+
350+
name?: string;
351+
352+
send_exemplars?: boolean;
353+
354+
send_native_histograms?: boolean;
355+
356+
sigv4?: {
357+
[x: string]: any;
358+
359+
};
360+
361+
azuread?: {
362+
[x: string]: any;
363+
364+
};
365+
366+
google_iam?: {
367+
[x: string]: any;
368+
369+
};
370+
371+
queue_config?: {
372+
[x: string]: any;
373+
374+
};
375+
376+
}[];
377+
378+
externalLabels?: {
379+
[x: string]: string;
380+
261381
};
262382

263383
};
@@ -319,8 +439,6 @@ export interface ByokAddonConfig {
319439

320440
};
321441

322-
[x: string]: any;
323-
324442
};
325443

326444
}

src/interfaces/org.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* auto-generated */
22

3-
import { S3Logging, CoralogixLogging, DatadogLogging, LogzioLogging, ElasticLogging, CloudWatchLogging, FluentdLogging, StackdriverLogging, SyslogLogging } from './orgLogging';
3+
import { S3Logging, CoralogixLogging, DatadogLogging, LogzioLogging, ElasticLogging, CloudWatchLogging, FluentdLogging, StackdriverLogging, SyslogLogging, OpenTelemetryLogging } from './orgLogging';
44
import { Tracing } from './tracing';
55
import { Kind, Tags, Links } from './base';
66

@@ -67,6 +67,8 @@ export interface OrgSpec {
6767

6868
syslog?: SyslogLogging;
6969

70+
opentelemetry?: OpenTelemetryLogging;
71+
7072
};
7173

7274
extraLogging?: {
@@ -88,6 +90,8 @@ export interface OrgSpec {
8890

8991
syslog?: SyslogLogging;
9092

93+
opentelemetry?: OpenTelemetryLogging;
94+
9195
}[];
9296

9397
tracing?: Tracing;

src/interfaces/orgLogging.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,18 @@ export interface DatadogLogging {
3232

3333
}
3434

35+
export interface OpenTelemetryLogging {
36+
endpoint: string;
37+
38+
headers?: {
39+
[x: string]: string;
40+
41+
};
42+
43+
credentials?: string;
44+
45+
}
46+
3547
export interface LogzioLogging {
3648
listenerHost: 'listener.logz.io' | 'listener-nl.logz.io';
3749

0 commit comments

Comments
 (0)