Merge pull request #10 from replicatedhq/cbo/sc-101432/embedded-artifacts-in-installation

Craig O'Donnell · web-flow · commit 4e646b87f7a1 · 2024-04-16T09:28:40.000-04:00
update embeddedClusterArtifacts type for installation
diff --git a/apis/kots/v1beta1/airgap_types.go b/apis/kots/v1beta1/airgap_types.go
@@ -42,7 +42,7 @@ type AirgapReleaseMeta struct {
 	UpdateCursor string `json:"updateCursor,omitempty"`
 }
 
-// EmbeddedClusterArtifacts maps embedded cluster artifacts to their path in the airgap bundle
+// EmbeddedClusterArtifacts maps embedded cluster artifacts to their path
 type EmbeddedClusterArtifacts struct {
 	Charts      string `json:"charts,omitempty"`
 	ImagesAmd64 string `json:"imagesAmd64,omitempty"`
diff --git a/apis/kots/v1beta1/installation_types.go b/apis/kots/v1beta1/installation_types.go
@@ -22,20 +22,20 @@ import (
 
 // InstallationSpec defines the desired state of InstallationSpec
 type InstallationSpec struct {
-	UpdateCursor             string                  `json:"updateCursor,omitempty"`
-	ChannelID                string                  `json:"channelID,omitempty"`
-	ChannelName              string                  `json:"channelName,omitempty"`
-	VersionLabel             string                  `json:"versionLabel,omitempty"`
-	IsRequired               bool                    `json:"isRequired,omitempty"`
-	ReleaseNotes             string                  `json:"releaseNotes,omitempty"`
-	ReleasedAt               *metav1.Time            `json:"releasedAt,omitempty"`
-	ReplicatedRegistryDomain string                  `json:"replicatedRegistryDomain,omitempty"`
-	ReplicatedProxyDomain    string                  `json:"replicatedProxyDomain,omitempty"`
-	ReplicatedChartNames     []string                `json:"replicatedChartNames,omitempty"`
-	EncryptionKey            string                  `json:"encryptionKey,omitempty"`
-	KnownImages              []InstallationImage     `json:"knownImages,omitempty"`
-	EmbeddedClusterArtifacts []string                `json:"embeddedClusterArtifacts,omitempty"`
-	YAMLErrors               []InstallationYAMLError `json:"yamlErrors,omitempty"`
+	UpdateCursor             string                    `json:"updateCursor,omitempty"`
+	ChannelID                string                    `json:"channelID,omitempty"`
+	ChannelName              string                    `json:"channelName,omitempty"`
+	VersionLabel             string                    `json:"versionLabel,omitempty"`
+	IsRequired               bool                      `json:"isRequired,omitempty"`
+	ReleaseNotes             string                    `json:"releaseNotes,omitempty"`
+	ReleasedAt               *metav1.Time              `json:"releasedAt,omitempty"`
+	ReplicatedRegistryDomain string                    `json:"replicatedRegistryDomain,omitempty"`
+	ReplicatedProxyDomain    string                    `json:"replicatedProxyDomain,omitempty"`
+	ReplicatedChartNames     []string                  `json:"replicatedChartNames,omitempty"`
+	EncryptionKey            string                    `json:"encryptionKey,omitempty"`
+	KnownImages              []InstallationImage       `json:"knownImages,omitempty"`
+	EmbeddedClusterArtifacts *EmbeddedClusterArtifacts `json:"embeddedClusterArtifacts,omitempty"`
+	YAMLErrors               []InstallationYAMLError   `json:"yamlErrors,omitempty"`
 }
 
 type InstallationImage struct {
diff --git a/apis/kots/v1beta1/zz_generated.deepcopy.go b/apis/kots/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crds/kots.io_airgaps.yaml b/config/crds/kots.io_airgaps.yaml
@@ -44,7 +44,7 @@ spec:
                 type: string
               embeddedClusterArtifacts:
                 description: EmbeddedClusterArtifacts maps embedded cluster artifacts
-                  to their path in the airgap bundle
+                  to their path
                 properties:
                   binaryAmd64:
                     type: string
diff --git a/config/crds/kots.io_installations.yaml b/config/crds/kots.io_installations.yaml
@@ -41,9 +41,18 @@ spec:
               channelName:
                 type: string
               embeddedClusterArtifacts:
-                items:
-                  type: string
-                type: array
+                description: EmbeddedClusterArtifacts maps embedded cluster artifacts
+                  to their path
+                properties:
+                  binaryAmd64:
+                    type: string
+                  charts:
+                    type: string
+                  imagesAmd64:
+                    type: string
+                  metadata:
+                    type: string
+                type: object
               encryptionKey:
                 type: string
               isRequired:
diff --git a/schemas/airgap-kots-v1beta1.json b/schemas/airgap-kots-v1beta1.json
@@ -27,7 +27,7 @@
           "type": "string"
         },
         "embeddedClusterArtifacts": {
-          "description": "EmbeddedClusterArtifacts maps embedded cluster artifacts to their path in the airgap bundle",
+          "description": "EmbeddedClusterArtifacts maps embedded cluster artifacts to their path",
           "type": "object",
           "properties": {
             "binaryAmd64": {
diff --git a/schemas/installation-kots-v1beta1.json b/schemas/installation-kots-v1beta1.json
@@ -24,9 +24,21 @@
           "type": "string"
         },
         "embeddedClusterArtifacts": {
-          "type": "array",
-          "items": {
-            "type": "string"
+          "description": "EmbeddedClusterArtifacts maps embedded cluster artifacts to their path",
+          "type": "object",
+          "properties": {
+            "binaryAmd64": {
+              "type": "string"
+            },
+            "charts": {
+              "type": "string"
+            },
+            "imagesAmd64": {
+              "type": "string"
+            },
+            "metadata": {
+              "type": "string"
+            }
           }
         },
         "encryptionKey": {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ type AirgapReleaseMeta struct {`
`42`	`42`	UpdateCursor string `json:"updateCursor,omitempty"`
`43`	`43`	`}`
`44`	`44`
`45`		`-// EmbeddedClusterArtifacts maps embedded cluster artifacts to their path in the airgap bundle`
	`45`	`+// EmbeddedClusterArtifacts maps embedded cluster artifacts to their path`
`46`	`46`	`type EmbeddedClusterArtifacts struct {`
`47`	`47`	Charts string `json:"charts,omitempty"`
`48`	`48`	ImagesAmd64 string `json:"imagesAmd64,omitempty"`