Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MGMT-15243: Skip any zero size manifests when applying #5355

Merged
merged 1 commit into from Jul 13, 2023
Merged

MGMT-15243: Skip any zero size manifests when applying #5355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions internal/ignition/ignition.go
View file
Open in desktop
Expand Up @@ -1574,6 +1574,12 @@ func (g *installerGenerator) downloadManifest(ctx context.Context, manifest stri
if err != nil {
return err
}

if len(content) == 0 {
// Ignore any empty files.
return nil
carbonin marked this conversation as resolved.
Show resolved Hide resolved
}

// manifest has full path as object-key on s3: clusterID/manifests/[manifests|openshift]/filename
// clusterID/manifests should be trimmed
prefix := manifests.GetManifestObjectName(*g.cluster.ID, "")
Expand Down
19 changes: 17 additions & 2 deletions internal/ignition/ignition_test.go
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@ import (
"errors"
"fmt"
"io"
"io/fs"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -921,15 +922,29 @@ var _ = Describe("downloadManifest", func() {
It("writes the correct file", func() {
ctx := context.Background()
manifestName := fmt.Sprintf("%s/manifests/openshift/masters-chrony-configuration.yaml", cluster.ID)
mockS3Client.EXPECT().Download(ctx, manifestName).Return(io.NopCloser(strings.NewReader("chronyconf")), int64(10), nil)
mockS3Client.EXPECT().Download(ctx, manifestName).Return(io.NopCloser(strings.NewReader("content:entry")), int64(10), nil)
Expect(os.Mkdir(filepath.Join(workDir, "/openshift"), 0755)).To(Succeed())
Expect(os.Mkdir(filepath.Join(workDir, "/manifests"), 0755)).To(Succeed())

Expect(generator.downloadManifest(ctx, manifestName)).To(Succeed())

content, err := os.ReadFile(filepath.Join(workDir, "/openshift/masters-chrony-configuration.yaml"))
Expect(err).NotTo(HaveOccurred())
Expect(content).To(Equal([]byte("chronyconf")))
Expect(content).To(Equal([]byte("content:entry")))
})

It("If a file has empty content, it will not be written", func() {
ctx := context.Background()
manifestName := fmt.Sprintf("%s/manifests/openshift/masters-chrony-configuration.yaml", cluster.ID)
mockS3Client.EXPECT().Download(ctx, manifestName).Return(io.NopCloser(strings.NewReader("")), int64(0), nil)
Expect(os.Mkdir(filepath.Join(workDir, "/openshift"), 0755)).To(Succeed())
Expect(os.Mkdir(filepath.Join(workDir, "/manifests"), 0755)).To(Succeed())

Expect(generator.downloadManifest(ctx, manifestName)).To(Succeed())

_, err := os.Stat(filepath.Join(workDir, "/openshift/masters-chrony-configuration.yaml"))
Expect(err).To(HaveOccurred())
Expect(errors.Is(err, fs.ErrNotExist)).To(BeTrue())
})
})

Expand Down