@@ -27,6 +27,7 @@ import (
2727 "github.com/replicatedhq/kots/pkg/imageutil"
2828 "github.com/replicatedhq/kots/pkg/kotsutil"
2929 "github.com/replicatedhq/kots/pkg/logger"
30+ kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
3031 oras "oras.land/oras-go/v2"
3132 orasfile "oras.land/oras-go/v2/content/file"
3233 orasremote "oras.land/oras-go/v2/registry/remote"
@@ -108,9 +109,9 @@ func WriteProgressLine(progressWriter io.Writer, line string) {
108109}
109110
110111// CopyAirgapImages pushes images found in the airgap bundle/airgap root to the configured registry.
111- func CopyAirgapImages (opts imagetypes.ProcessImageOptions , log * logger.CLILogger ) ( * imagetypes. CopyAirgapImagesResult , error ) {
112+ func CopyAirgapImages (opts imagetypes.ProcessImageOptions , log * logger.CLILogger ) error {
112113 if opts .AirgapBundle == "" {
113- return & imagetypes. CopyAirgapImagesResult {}, nil
114+ return nil
114115 }
115116
116117 pushOpts := imagetypes.PushImagesOptions {
@@ -125,27 +126,25 @@ func CopyAirgapImages(opts imagetypes.ProcessImageOptions, log *logger.CLILogger
125126 LogForUI : true ,
126127 }
127128
128- copyResult , err := TagAndPushImagesFromBundle (opts .AirgapBundle , pushOpts )
129+ err := TagAndPushImagesFromBundle (opts .AirgapBundle , pushOpts )
129130 if err != nil {
130- return nil , errors .Wrap (err , "failed to push images from bundle" )
131+ return errors .Wrap (err , "failed to push images from bundle" )
131132 }
132133
133- return & imagetypes.CopyAirgapImagesResult {
134- EmbeddedClusterArtifacts : copyResult .EmbeddedClusterArtifacts ,
135- }, nil
134+ return nil
136135}
137136
138- func TagAndPushImagesFromBundle (airgapBundle string , options imagetypes.PushImagesOptions ) ( * imagetypes. CopyAirgapImagesResult , error ) {
137+ func TagAndPushImagesFromBundle (airgapBundle string , options imagetypes.PushImagesOptions ) error {
139138 airgap , err := kotsutil .FindAirgapMetaInBundle (airgapBundle )
140139 if err != nil {
141- return nil , errors .Wrap (err , "failed to find airgap meta" )
140+ return errors .Wrap (err , "failed to find airgap meta" )
142141 }
143142
144143 switch airgap .Spec .Format {
145144 case dockertypes .FormatDockerRegistry :
146145 extractedBundle , err := os .MkdirTemp ("" , "extracted-airgap-kots" )
147146 if err != nil {
148- return nil , errors .Wrap (err , "failed to create temp dir for unarchived airgap bundle" )
147+ return errors .Wrap (err , "failed to create temp dir for unarchived airgap bundle" )
149148 }
150149 defer os .RemoveAll (extractedBundle )
151150
@@ -155,34 +154,32 @@ func TagAndPushImagesFromBundle(airgapBundle string, options imagetypes.PushImag
155154 },
156155 }
157156 if err := tarGz .Unarchive (airgapBundle , extractedBundle ); err != nil {
158- return nil , errors .Wrap (err , "falied to unarchive airgap bundle" )
157+ return errors .Wrap (err , "falied to unarchive airgap bundle" )
159158 }
160159 if err := PushImagesFromTempRegistry (extractedBundle , airgap .Spec .SavedImages , options ); err != nil {
161- return nil , errors .Wrap (err , "failed to push images from docker registry bundle" )
160+ return errors .Wrap (err , "failed to push images from docker registry bundle" )
162161 }
163162 case dockertypes .FormatDockerArchive , "" :
164163 if err := PushImagesFromDockerArchiveBundle (airgapBundle , options ); err != nil {
165- return nil , errors .Wrap (err , "failed to push images from docker archive bundle" )
164+ return errors .Wrap (err , "failed to push images from docker archive bundle" )
166165 }
167166 default :
168- return nil , errors .Errorf ("Airgap bundle format '%s' is not supported" , airgap .Spec .Format )
167+ return errors .Errorf ("Airgap bundle format '%s' is not supported" , airgap .Spec .Format )
169168 }
170169
171170 pushEmbeddedArtifactsOpts := imagetypes.PushEmbeddedClusterArtifactsOptions {
172- Registry : options .Registry ,
173- Tag : imageutil .SanitizeTag (fmt .Sprintf ("%s-%s-%s" , airgap .Spec .ChannelID , airgap .Spec .UpdateCursor , airgap .Spec .VersionLabel )),
174- HTTPClient : orasretry .DefaultClient ,
171+ Registry : options .Registry ,
172+ ChannelID : airgap .Spec .ChannelID ,
173+ UpdateCursor : airgap .Spec .UpdateCursor ,
174+ VersionLabel : airgap .Spec .VersionLabel ,
175+ HTTPClient : orasretry .DefaultClient ,
175176 }
176- pushedArtifacts , err : =PushEmbeddedClusterArtifacts (airgapBundle , pushEmbeddedArtifactsOpts )
177+ err = PushEmbeddedClusterArtifacts (airgapBundle , airgap . Spec . EmbeddedClusterArtifacts , pushEmbeddedArtifactsOpts )
177178 if err != nil {
178- return nil , errors .Wrap (err , "failed to push embedded cluster artifacts" )
179- }
180-
181- result := & imagetypes.CopyAirgapImagesResult {
182- EmbeddedClusterArtifacts : pushedArtifacts ,
179+ return errors .Wrap (err , "failed to push embedded cluster artifacts" )
183180 }
184181
185- return result , nil
182+ return nil
186183}
187184
188185func PushImagesFromTempRegistry (airgapRootDir string , imageList []string , options imagetypes.PushImagesOptions ) error {
@@ -684,70 +681,75 @@ func reportWriterWithProgress(imageInfos map[string]*imagetypes.ImageInfo, repor
684681 return pipeWriter
685682}
686683
687- func PushEmbeddedClusterArtifacts (airgapBundle string , opts imagetypes.PushEmbeddedClusterArtifactsOptions ) ([] string , error ) {
684+ func PushEmbeddedClusterArtifacts (airgapBundle string , artifactsToPush * kotsv1beta1. EmbeddedClusterArtifacts , opts imagetypes.PushEmbeddedClusterArtifactsOptions ) error {
688685 tmpDir , err := os .MkdirTemp ("" , "embedded-cluster-artifacts" )
689686 if err != nil {
690- return nil , errors .Wrap (err , "failed to create temp directory" )
687+ return errors .Wrap (err , "failed to create temp directory" )
691688 }
692689 defer os .RemoveAll (tmpDir )
693690
694691 fileReader , err := os .Open (airgapBundle )
695692 if err != nil {
696- return nil , errors .Wrap (err , "failed to open file" )
693+ return errors .Wrap (err , "failed to open file" )
697694 }
698695 defer fileReader .Close ()
699696
700697 gzipReader , err := gzip .NewReader (fileReader )
701698 if err != nil {
702- return nil , errors .Wrap (err , "failed to get new gzip reader" )
699+ return errors .Wrap (err , "failed to get new gzip reader" )
703700 }
704701 defer gzipReader .Close ()
705702
706703 var artifacts []string
707704
708705 tarReader := tar .NewReader (gzipReader )
709- pushedArtifacts := make ([]string , 0 )
710706 for {
711707 header , err := tarReader .Next ()
712708 if err == io .EOF {
713709 break
714710 }
715711 if err != nil {
716- return nil , errors .Wrap (err , "failed to get read archive" )
712+ return errors .Wrap (err , "failed to get read archive" )
717713 }
718714
719715 if header .Typeflag != tar .TypeReg {
720716 continue
721717 }
722718
723- if filepath . Dir (header .Name ) != "embedded-cluster" {
719+ if ! shouldPushArtifact (header .Name , artifactsToPush ) {
724720 continue
725721 }
726722
727723 dstFilePath := filepath .Join (tmpDir , header .Name )
728724 if err := os .MkdirAll (filepath .Dir (dstFilePath ), 0755 ); err != nil {
729- return nil , errors .Wrap (err , "failed to create path" )
725+ return errors .Wrap (err , "failed to create path" )
730726 }
731727
732728 dstFile , err := os .Create (dstFilePath )
733729 if err != nil {
734- return nil , errors .Wrap (err , "failed to create file" )
730+ return errors .Wrap (err , "failed to create file" )
735731 }
736732
737733 if _ , err := io .Copy (dstFile , tarReader ); err != nil {
738734 dstFile .Close ()
739- return nil , errors .Wrap (err , "failed to copy file data" )
735+ return errors .Wrap (err , "failed to copy file data" )
740736 }
741737
742738 dstFile .Close ()
743739 artifacts = append (artifacts , dstFilePath )
744740 }
745741
746742 for i , dstFilePath := range artifacts {
747- name := filepath .Base (dstFilePath )
748- repository := filepath .Join ("embedded-cluster" , imageutil .SanitizeRepo (name ))
743+ ociArtifactPath := imageutil .NewEmbeddedClusterOCIArtifactPath (dstFilePath , imageutil.EmbeddedClusterArtifactOCIPathOptions {
744+ RegistryHost : opts .Registry .Endpoint ,
745+ RegistryNamespace : opts .Registry .Namespace ,
746+ ChannelID : opts .ChannelID ,
747+ UpdateCursor : opts .UpdateCursor ,
748+ VersionLabel : opts .VersionLabel ,
749+ })
750+
749751 artifactFile := imagetypes.OCIArtifactFile {
750- Name : name ,
752+ Name : ociArtifactPath . Name ,
751753 Path : dstFilePath ,
752754 MediaType : EmbeddedClusterMediaType ,
753755 }
@@ -756,20 +758,31 @@ func PushEmbeddedClusterArtifacts(airgapBundle string, opts imagetypes.PushEmbed
756758 Files : []imagetypes.OCIArtifactFile {artifactFile },
757759 ArtifactType : EmbeddedClusterArtifactType ,
758760 Registry : opts .Registry ,
759- Repository : repository ,
760- Tag : opts .Tag ,
761+ Repository : ociArtifactPath . Repository ,
762+ Tag : ociArtifactPath .Tag ,
761763 HTTPClient : opts .HTTPClient ,
762764 }
763765
764766 fmt .Printf ("Pushing embedded cluster artifacts (%d/%d)\n " , i + 1 , len (artifacts ))
765- artifact := fmt .Sprintf ("%s:%s" , filepath .Join (opts .Registry .Endpoint , opts .Registry .Namespace , repository ), opts .Tag )
766767 if err := pushOCIArtifact (pushOCIArtifactOpts ); err != nil {
767- return nil , errors .Wrapf (err , "failed to push oci artifact %s" , name )
768+ return errors .Wrapf (err , "failed to push oci artifact %s" , ociArtifactPath . Name )
768769 }
769- pushedArtifacts = append (pushedArtifacts , artifact )
770770 }
771771
772- return pushedArtifacts , nil
772+ return nil
773+ }
774+
775+ func shouldPushArtifact (artifactPath string , artifactsToPush * kotsv1beta1.EmbeddedClusterArtifacts ) bool {
776+ if artifactsToPush == nil {
777+ return false
778+ }
779+
780+ switch artifactPath {
781+ case artifactsToPush .BinaryAmd64 , artifactsToPush .Charts , artifactsToPush .ImagesAmd64 , artifactsToPush .Metadata :
782+ return true
783+ default :
784+ return false
785+ }
773786}
774787
775788func pushOCIArtifact (opts imagetypes.PushOCIArtifactOptions ) error {
0 commit comments