openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 15:47:14 +01:00
Code Issues Releases Activity

Throw warnings no errors

Browse Source 
Signed-off-by: Pawan Pinjarkar <ppinjark@redhat.com>
This commit is contained in:
Pawan Pinjarkar
2022-10-11 12:36:13 -05:00
parent d3856aa7c6
commit e40db31b06
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/asset/agent/mirror/registriesconf.go
View File

@@ -13,6 +13,7 @@ import (
"github.com/openshift/installer/pkg/asset/releaseimage"
"github.com/pelletier/go-toml"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
var (
@@ -239,21 +240,22 @@ func (i *RegistriesConf) Load(f asset.FileFetcher) (bool, error) {
func (i *RegistriesConf) finish() error {
if string(i.File.Data) != defaultRegistriesConf {
return i.validateReleaseImageIsSameInRegistriesConf()
i.validateReleaseImageIsSameInRegistriesConf()
}
return nil
}
func (i *RegistriesConf) validateReleaseImageIsSameInRegistriesConf() error {
func (i *RegistriesConf) validateReleaseImageIsSameInRegistriesConf() {
var found bool
for _, registry := range i.Config.Registries {
if !i.Generated && registry.Endpoint.Location == "" {
return errors.New(fmt.Sprintf("%s should have an entry matching the releaseImage %s. Found \"%s\"", RegistriesConfFilename, i.ReleaseImagePath, registry.Endpoint.Location))
source := registry.Endpoint.Location
if !i.Generated && source == "" {
logrus.Warnf(fmt.Sprintf("%s should have an entry matching the releaseImage %s. Found \"%s\"", RegistriesConfFilename, i.ReleaseImagePath, source))
}
if registry.Endpoint.Location == i.ReleaseImagePath {
if source == i.ReleaseImagePath {
found = true
break
}
@@ -261,9 +263,9 @@ func (i *RegistriesConf) validateReleaseImageIsSameInRegistriesConf() error {
if !found {
if i.Generated {
return errors.New(fmt.Sprintf("The ImageContentSource configuration in install-config.yaml should have an entry matching the releaseImage %s", i.ReleaseImagePath))
logrus.Warnf(fmt.Sprintf("The ImageContentSources configuration in install-config.yaml should have at-least one source field matching the releaseImage value %s", i.ReleaseImagePath))
return
}
return errors.New(fmt.Sprintf("%s should have an entry matching the releaseImage %s", RegistriesConfFilename, i.ReleaseImagePath))
logrus.Warnf(fmt.Sprintf("%s should have an entry matching the releaseImage %s", RegistriesConfFilename, i.ReleaseImagePath))
}
return nil
}

28
pkg/asset/agent/mirror/registriesconf_test.go
View File

@@ -22,7 +22,6 @@ func TestRegistriesConf_Generate(t *testing.T) {
cases := []struct {
name string
dependencies []asset.Asset
expectedError string
expectedConfig string
}{
{
@@ -53,7 +52,7 @@ func TestRegistriesConf_Generate(t *testing.T) {
expectedConfig: defaultRegistriesConf,
},
{
name: "invalid-image-content-sources",
name: "invalid-config-image-content-source-does-not-match-releaseImage",
dependencies: []asset.Asset{
&agent.OptionalInstallConfig{
Supplied: true,
@@ -83,7 +82,7 @@ func TestRegistriesConf_Generate(t *testing.T) {
PullSpec: "registry.ci.openshift.org/ocp/release:4.11.0-0.ci-2022-05-16-202609",
},
},
expectedError: "The ImageContentSource configuration in install-config.yaml should have an entry matching the releaseImage registry.ci.openshift.org/ocp/release",
expectedConfig: "unqualified-search-registries = []\n\n[[registry]]\n location = \"registry.ci.openshift.org/origin/release\"\n mirror-by-digest-only = true\n prefix = \"\"\n\n [[registry.mirror]]\n location = \"virthost.ostest.test.metalkube.org:5000/localimages/local-release-image\"\n\n[[registry]]\n location = \"quay.io/openshift-release-dev/ocp-v4.0-art-dev\"\n mirror-by-digest-only = true\n prefix = \"\"\n\n [[registry.mirror]]\n location = \"virthost.ostest.test.metalkube.org:5000/localimages/local-release-image\"\n",
},
{
name: "valid-image-content-sources",
@@ -145,15 +144,11 @@ func TestRegistriesConf_Generate(t *testing.T) {
asset := &RegistriesConf{}
err := asset.Generate(parents)
if tc.expectedError != "" {
assert.EqualError(t, err, tc.expectedError)
} else {
assert.NoError(t, err)
assert.NoError(t, err)
files := asset.Files()
assert.Len(t, files, 1)
assert.Equal(t, tc.expectedConfig, string(files[0].Data))
}
files := asset.Files()
assert.Len(t, files, 1)
assert.Equal(t, tc.expectedConfig, string(files[0].Data))
})
}
}
@@ -168,7 +163,7 @@ func TestRegistries_LoadedFromDisk(t *testing.T) {
expectedError string
}{
{
name: "invalid-config-file",
name: "invalid-fields-in-config-file",
data: `
[[registry]]
wrongLocationkey = "registry.ci.openshift.org/origin/release"
@@ -178,13 +173,12 @@ mirror-by-digest-only = false
location = "virthost.ostest.test.metalkube.org:5000/localimages/local-release-image"
[[registry]]
location = "quay.io/openshift-release-dev/ocp-v4.0-art-dev"
locations = "quay.io/openshift-release-dev/ocp-v4.0-art-dev"
mirror-by-digest-only = false
[[registry.mirror]]
location = "virthost.ostest.test.metalkube.org:5000/localimages/local-release-image"`,
expectedFound: false,
expectedError: "mirror/registries.conf should have an entry matching the releaseImage registry.ci.openshift.org/origin/release. Found \"\"",
expectedFound: true,
},
{
name: "valid-config-file",
@@ -221,8 +215,8 @@ mirror-by-digest-only = false
[[registry.mirror]]
location = "virthost.ostest.test.metalkube.org:5000/localimages/local-release-image"`,
expectedFound: false,
expectedError: "mirror/registries.conf should have an entry matching the releaseImage registry.ci.openshift.org/origin/release",
expectedFound: true,
expectedError: "",
},
{
name: "file-not-found",