Skip to content

Commit

Permalink
Bumped the upgrade version from 0.1.1 to 0.2.0
Browse files Browse the repository at this point in the history 
Signed-off-by: jubittajohn <jujohn@redhat.com>
  • Loading branch information
@jubittajohn
jubittajohn committed Aug 10, 2023
1 parent 9743766 commit 0d30cd3
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ kind-load-test-artifacts: $(KIND) ## Load the e2e testdata container images into
$(KIND) load docker-image localhost/testdata/catalogs/test-catalog:e2e --name $(KIND_CLUSTER_NAME)

.PHONY: deploy-local-registry
deploy-local-registry: ## Deploy local docker registry
deploy-local-registry: ## Deploy local registry
$(CONTAINER_RUNTIME) run -d -p 5001:5000 --restart=always --name local-registry registry:2

.PHONY: cleanup-local-registry
Expand Down
4 changes: 2 additions & 2 deletions test/operator-framework-e2e/create_fbc_helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ func WriteFBC(fbc declcfg.DeclarativeConfig, fbcFilePath, fbcFileName string) er
return err
}

// Forms the semver using the bundle images passed
func formOLMSemverFile(semverFileName string, bundleImages []string) error {
// Forms the semver template using the bundle images passed
func formOLMSemverTemplateFile(semverFileName string, bundleImages []string) error {
images := make([]string, 0, len(bundleImages))
for _, bundleImage := range bundleImages {
images = append(images, fmt.Sprintf(" - image: %s", bundleImage))
Expand Down
60 changes: 30 additions & 30 deletions test/operator-framework-e2e/operator_framework_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ var _ = Describe("Operator Framework E2E for plain+v0 bundles", func() {
bundleVersion: "0.1.0",
},
{
bundleVersion: "0.1.1",
bundleVersion: "0.2.0",
},
},
}
Expand All @@ -149,7 +149,7 @@ var _ = Describe("Operator Framework E2E for plain+v0 bundles", func() {
}
operatorAction = &OperatorActionInfo{
installVersion: "0.1.0",
upgradeVersion: "0.1.1",
upgradeVersion: "0.2.0",
}
for i, b := range bundleInfo.bundles {
bundleInfo.bundles[i].bInputDir = catalogDInfo.operatorName + ".v" + b.bundleVersion
Expand Down Expand Up @@ -197,7 +197,7 @@ var _ = Describe("Operator Framework E2E for plain+v0 bundles", func() {

By("building/pushing/kind loading the catalog images")
dockerContext := catalogDInfo.baseFolderPath
dockerfilePath := filepath.Join(dockerContext, catalogDInfo.catalogDir+".Dockerfile")
dockerfilePath := filepath.Join(dockerContext, fmt.Sprintf("%s.Dockerfile", catalogDInfo.catalogDir))
err = buildPushLoadContainer(catalogDInfo.imageRef, dockerfilePath, dockerContext, kindServer, GinkgoWriter)
Expect(err).ToNot(HaveOccurred())

Expand Down Expand Up @@ -243,24 +243,24 @@ var _ = Describe("Operator Framework E2E for plain+v0 bundles", func() {
for _, b := range bundleInfo.bundles {
toDelete = append(toDelete, bundleInfo.baseFolderPath+"/"+b.bInputDir) // delete the registry+v1 bundles formed
}
toDelete = append(toDelete, sdkInfo.projectName) //delete the sdk project directory
toDelete = append(toDelete, filepath.Join(catalogDInfo.baseFolderPath, catalogDInfo.catalogDir)) // delete the FBC formed
toDelete = append(toDelete, filepath.Join(catalogDInfo.baseFolderPath, catalogDInfo.catalogDir+".Dockerfile")) // delete the catalog Dockerfile generated
toDelete = append(toDelete, sdkInfo.projectName) //delete the sdk project directory
toDelete = append(toDelete, filepath.Join(catalogDInfo.baseFolderPath, catalogDInfo.catalogDir)) // delete the FBC formed
toDelete = append(toDelete, filepath.Join(catalogDInfo.baseFolderPath, fmt.Sprintf("%s.Dockerfile", catalogDInfo.catalogDir))) // delete the catalog Dockerfile generated
err = deleteFolderFile(toDelete)
Expect(err).ToNot(HaveOccurred())
})
})

var _ = Describe("Operator Framework E2E for registry+v1 bundles", func() {
var (
sdkInfo *SdkProjectInfo
bundleInfo *BundleInfo
catalogDInfo *CatalogDInfo
operatorAction *OperatorActionInfo
operatorCatalog *catalogd.Catalog
operator *operatorv1alpha1.Operator
semverFileName string
err error
sdkInfo *SdkProjectInfo
bundleInfo *BundleInfo
catalogDInfo *CatalogDInfo
operatorAction *OperatorActionInfo
operatorCatalog *catalogd.Catalog
operator *operatorv1alpha1.Operator
semverTemplateFileName string
err error
)
BeforeEach(func() {
sdkInfo = &SdkProjectInfo{
Expand All @@ -277,7 +277,7 @@ var _ = Describe("Operator Framework E2E for registry+v1 bundles", func() {
bundleVersion: "0.1.0",
},
{
bundleVersion: "0.1.1",
bundleVersion: "0.2.0",
},
},
}
Expand All @@ -288,7 +288,7 @@ var _ = Describe("Operator Framework E2E for registry+v1 bundles", func() {
}
operatorAction = &OperatorActionInfo{
installVersion: "0.1.0",
upgradeVersion: "0.1.1",
upgradeVersion: "0.2.0",
}
for i, b := range bundleInfo.bundles {
bundleInfo.bundles[i].bInputDir = sdkInfo.projectName + ".v" + b.bundleVersion
Expand All @@ -297,7 +297,7 @@ var _ = Describe("Operator Framework E2E for registry+v1 bundles", func() {
catalogDInfo.catalogDir = catalogDInfo.operatorName + "-catalog"
catalogDInfo.imageRef = remoteRegistryRepo + catalogDInfo.catalogDir + ":test"

semverFileName = "registry-semver.yaml"
semverTemplateFileName = "registry-semver.yaml"
})
It("should succeed", func() {
By("creating a new operator-sdk project")
Expand Down Expand Up @@ -329,12 +329,12 @@ var _ = Describe("Operator Framework E2E for registry+v1 bundles", func() {
for i, bundle := range bundleInfo.bundles {
bundleImageRefs[i] = bundle.imageRef
}
err = genRegistryCatalogDirectory(catalogDInfo, bundleImageRefs, semverFileName)
err = genRegistryCatalogDirectory(catalogDInfo, bundleImageRefs, semverTemplateFileName)
Expect(err).ToNot(HaveOccurred())

By("building/pushing/kind loading the catalog images")
dockerContext := catalogDInfo.baseFolderPath
dockerFilePath := filepath.Join(dockerContext, catalogDInfo.catalogDir+".Dockerfile")
dockerFilePath := filepath.Join(dockerContext, fmt.Sprintf("%s.Dockerfile", catalogDInfo.catalogDir))
err = buildPushLoadContainer(catalogDInfo.imageRef, dockerFilePath, dockerContext, kindServer, GinkgoWriter)
Expect(err).ToNot(HaveOccurred())

Expand Down Expand Up @@ -377,10 +377,10 @@ var _ = Describe("Operator Framework E2E for registry+v1 bundles", func() {
for _, b := range bundleInfo.bundles {
toDelete = append(toDelete, bundleInfo.baseFolderPath+"/"+b.bInputDir) // delete the registry+v1 bundles formed
}
toDelete = append(toDelete, sdkInfo.projectName) //delete the sdk project directory
toDelete = append(toDelete, semverFileName) // delete the semver yaml formed
toDelete = append(toDelete, filepath.Join(catalogDInfo.baseFolderPath, catalogDInfo.catalogDir)) // delete the FBC formed
toDelete = append(toDelete, filepath.Join(catalogDInfo.baseFolderPath, catalogDInfo.catalogDir+".Dockerfile")) // delete the catalog Dockerfile generated
toDelete = append(toDelete, sdkInfo.projectName) //delete the sdk project directory
toDelete = append(toDelete, semverTemplateFileName) // delete the semver yaml formed
toDelete = append(toDelete, filepath.Join(catalogDInfo.baseFolderPath, catalogDInfo.catalogDir)) // delete the FBC formed
toDelete = append(toDelete, filepath.Join(catalogDInfo.baseFolderPath, fmt.Sprintf("%s.Dockerfile", catalogDInfo.catalogDir))) // delete the catalog Dockerfile generated
err = deleteFolderFile(toDelete)
Expect(err).ToNot(HaveOccurred())
})
Expand Down Expand Up @@ -609,7 +609,7 @@ func genPlainCatalogDirectory(catalogDInfo *CatalogDInfo, imageRefsBundleVersion
}

// generating dockerfile for the catalog using custom routine
dockerFilePath := filepath.Join(catalogDInfo.baseFolderPath, catalogDInfo.catalogDir+".Dockerfile")
dockerFilePath := filepath.Join(catalogDInfo.baseFolderPath, fmt.Sprintf("%s.Dockerfile", catalogDInfo.catalogDir))
if err := generateCatalogDockerFile(dockerFilePath, catalogDInfo.catalogDir); err != nil {
return fmt.Errorf("Error generating catalog Dockerfile for the catalog directory %v : %v", catalogDInfo.catalogDir, err)
}
Expand All @@ -618,19 +618,19 @@ func genPlainCatalogDirectory(catalogDInfo *CatalogDInfo, imageRefsBundleVersion

// Generates catalog contents for the registry bundle format. The FBC(yaml file) and the Dockerfile
// is formed using opm tool.
func genRegistryCatalogDirectory(catalogDInfo *CatalogDInfo, bundleImageRefs []string, semverFileName string) error {
func genRegistryCatalogDirectory(catalogDInfo *CatalogDInfo, bundleImageRefs []string, semverTemplateFileName string) error {
// forming the semver template yaml file
sdkCatalogFile := filepath.Join(catalogDInfo.baseFolderPath, catalogDInfo.catalogDir, catalogDInfo.fbcFileName)
if err := formOLMSemverFile(semverFileName, bundleImageRefs); err != nil {
return fmt.Errorf("Error forming the semver template yaml file %v : %v", semverFileName, err)
if err := formOLMSemverTemplateFile(semverTemplateFileName, bundleImageRefs); err != nil {
return fmt.Errorf("Error forming the semver template yaml file %v : %v", semverTemplateFileName, err)
}

// generating the FBC using semver template")
semverFileAbsPath, err := filepath.Abs(semverFileName)
semverTemplateFileAbsPath, err := filepath.Abs(semverTemplateFileName)
if err != nil {
return fmt.Errorf("Error forming the absolute path of the semver file %v : %v", semverFileName, err)
return fmt.Errorf("Error forming the absolute path of the semver file %v : %v", semverTemplateFileName, err)
}
opmArgs := "OPM_ARGS=alpha render-template semver " + semverFileAbsPath + " -o yaml --use-http"
opmArgs := "OPM_ARGS=alpha render-template semver " + semverTemplateFileAbsPath + " -o yaml --use-http"
cmd := exec.Command("make", "-s", "opm", opmArgs)
cmd.Dir = operatorControllerHome
output, err := cmd.Output()
Expand Down

0 comments on commit 0d30cd3

Please sign in to comment.