Skip to content

Commit 4e646b8

Browse files
author
Craig O'Donnell
authored
Merge pull request #10 from replicatedhq/cbo/sc-101432/embedded-artifacts-in-installation
update embeddedClusterArtifacts type for installation
2 parents 2837245 + 5d09714 commit 4e646b8

File tree

7 files changed

+46
-25
lines changed

7 files changed

+46
-25
lines changed

apis/kots/v1beta1/airgap_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type AirgapReleaseMeta struct {
4242
UpdateCursor string `json:"updateCursor,omitempty"`
4343
}
4444

45-
// EmbeddedClusterArtifacts maps embedded cluster artifacts to their path in the airgap bundle
45+
// EmbeddedClusterArtifacts maps embedded cluster artifacts to their path
4646
type EmbeddedClusterArtifacts struct {
4747
Charts string `json:"charts,omitempty"`
4848
ImagesAmd64 string `json:"imagesAmd64,omitempty"`

apis/kots/v1beta1/installation_types.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ import (
2222

2323
// InstallationSpec defines the desired state of InstallationSpec
2424
type InstallationSpec struct {
25-
UpdateCursor string `json:"updateCursor,omitempty"`
26-
ChannelID string `json:"channelID,omitempty"`
27-
ChannelName string `json:"channelName,omitempty"`
28-
VersionLabel string `json:"versionLabel,omitempty"`
29-
IsRequired bool `json:"isRequired,omitempty"`
30-
ReleaseNotes string `json:"releaseNotes,omitempty"`
31-
ReleasedAt *metav1.Time `json:"releasedAt,omitempty"`
32-
ReplicatedRegistryDomain string `json:"replicatedRegistryDomain,omitempty"`
33-
ReplicatedProxyDomain string `json:"replicatedProxyDomain,omitempty"`
34-
ReplicatedChartNames []string `json:"replicatedChartNames,omitempty"`
35-
EncryptionKey string `json:"encryptionKey,omitempty"`
36-
KnownImages []InstallationImage `json:"knownImages,omitempty"`
37-
EmbeddedClusterArtifacts []string `json:"embeddedClusterArtifacts,omitempty"`
38-
YAMLErrors []InstallationYAMLError `json:"yamlErrors,omitempty"`
25+
UpdateCursor string `json:"updateCursor,omitempty"`
26+
ChannelID string `json:"channelID,omitempty"`
27+
ChannelName string `json:"channelName,omitempty"`
28+
VersionLabel string `json:"versionLabel,omitempty"`
29+
IsRequired bool `json:"isRequired,omitempty"`
30+
ReleaseNotes string `json:"releaseNotes,omitempty"`
31+
ReleasedAt *metav1.Time `json:"releasedAt,omitempty"`
32+
ReplicatedRegistryDomain string `json:"replicatedRegistryDomain,omitempty"`
33+
ReplicatedProxyDomain string `json:"replicatedProxyDomain,omitempty"`
34+
ReplicatedChartNames []string `json:"replicatedChartNames,omitempty"`
35+
EncryptionKey string `json:"encryptionKey,omitempty"`
36+
KnownImages []InstallationImage `json:"knownImages,omitempty"`
37+
EmbeddedClusterArtifacts *EmbeddedClusterArtifacts `json:"embeddedClusterArtifacts,omitempty"`
38+
YAMLErrors []InstallationYAMLError `json:"yamlErrors,omitempty"`
3939
}
4040

4141
type InstallationImage struct {

apis/kots/v1beta1/zz_generated.deepcopy.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crds/kots.io_airgaps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spec:
4444
type: string
4545
embeddedClusterArtifacts:
4646
description: EmbeddedClusterArtifacts maps embedded cluster artifacts
47-
to their path in the airgap bundle
47+
to their path
4848
properties:
4949
binaryAmd64:
5050
type: string

config/crds/kots.io_installations.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,18 @@ spec:
4141
channelName:
4242
type: string
4343
embeddedClusterArtifacts:
44-
items:
45-
type: string
46-
type: array
44+
description: EmbeddedClusterArtifacts maps embedded cluster artifacts
45+
to their path
46+
properties:
47+
binaryAmd64:
48+
type: string
49+
charts:
50+
type: string
51+
imagesAmd64:
52+
type: string
53+
metadata:
54+
type: string
55+
type: object
4756
encryptionKey:
4857
type: string
4958
isRequired:

schemas/airgap-kots-v1beta1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"type": "string"
2828
},
2929
"embeddedClusterArtifacts": {
30-
"description": "EmbeddedClusterArtifacts maps embedded cluster artifacts to their path in the airgap bundle",
30+
"description": "EmbeddedClusterArtifacts maps embedded cluster artifacts to their path",
3131
"type": "object",
3232
"properties": {
3333
"binaryAmd64": {

schemas/installation-kots-v1beta1.json

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,21 @@
2424
"type": "string"
2525
},
2626
"embeddedClusterArtifacts": {
27-
"type": "array",
28-
"items": {
29-
"type": "string"
27+
"description": "EmbeddedClusterArtifacts maps embedded cluster artifacts to their path",
28+
"type": "object",
29+
"properties": {
30+
"binaryAmd64": {
31+
"type": "string"
32+
},
33+
"charts": {
34+
"type": "string"
35+
},
36+
"imagesAmd64": {
37+
"type": "string"
38+
},
39+
"metadata": {
40+
"type": "string"
41+
}
3042
}
3143
},
3244
"encryptionKey": {

0 commit comments

Comments
 (0)