NO-ISSUE: Update Konflux references (cloud_hotfix_releases)

Makefile

@@ -39,7 +39,7 @@ DEBUG_SERVICE_PORT := $(or ${DEBUG_SERVICE_PORT},40000)
 SERVICE := $(or ${SERVICE},${ASSISTED_ORG}/assisted-service:${ASSISTED_TAG})
 IMAGE_SERVICE := $(or ${IMAGE_SERVICE},${ASSISTED_ORG}/assisted-image-service:${ASSISTED_TAG})
 ASSISTED_UI := $(or ${ASSISTED_UI},${ASSISTED_ORG}/assisted-installer-ui:${ASSISTED_TAG})
-PSQL_IMAGE := $(or ${PSQL_IMAGE},quay.io/centos7/postgresql-12-centos7:latest)
+PSQL_IMAGE := $(or ${PSQL_IMAGE},quay.io/sclorg/postgresql-12-c8s:latest)
 BUNDLE_IMAGE := $(or ${BUNDLE_IMAGE},${ASSISTED_ORG}/assisted-service-operator-bundle:${ASSISTED_TAG})
 INDEX_IMAGE := $(or ${INDEX_IMAGE},${ASSISTED_ORG}/assisted-service-index:${ASSISTED_TAG})
 

cmd/main.go

@@ -76,7 +76,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
-	"github.com/thoas/go-funk"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
@@ -261,7 +260,7 @@ func main() {
 	failOnError(err, "Failed to initialize OSImages")
 
 	var releaseImagesArray = models.ReleaseImages{}
-	parseReleaseImages(&releaseImagesArray, failOnError)
+	versions.ParseReleaseImages(&releaseImagesArray, Options.ReleaseImages, failOnError)
 
 	var releaseSourcesArray = models.ReleaseSources{}
 	if Options.ReleaseSourcesConfig.ReleaseSources != "" {
@@ -270,7 +269,7 @@ func main() {
 	}
 
 	var ignoredOpenshiftVersions = []string{}
-	parseIgnoredOpenshiftVersions(&ignoredOpenshiftVersions, failOnError)
+	versions.ParseIgnoredOpenshiftVersions(&ignoredOpenshiftVersions, Options.IgnoredOpenshiftVersions, failOnError)
 
 	log.Println(fmt.Sprintf("Started service with OS Images %v, Release Images %v, Release Sources %v, Ignored OpenShift Versions %v",
 		Options.OsImages, Options.ReleaseImages, Options.ReleaseSourcesConfig.ReleaseSources, Options.IgnoredOpenshiftVersions))
@@ -319,7 +318,7 @@ func main() {
 		maxDuration(Options.InstructionConfig.DiskCheckTimeout, Options.InstructionConfig.ImageAvailabilityTimeout)+1*time.Minute)
 	var lead leader.ElectorInterface
 	var k8sClient *kubernetes.Clientset
-	var autoMigrationLeader leader.ElectorInterface
+	var startupLeader leader.ElectorInterface
 
 	mirrorRegistriesBuilder := mirrorregistries.New()
 	releaseHandler := oc.NewRelease(&executer.CommonExecuter{},
@@ -382,7 +381,7 @@ func main() {
 		failOnError(cerr, "Failed to create kubernetes cluster config")
 		k8sClient = kubernetes.NewForConfigOrDie(cfg)
 
-		autoMigrationLeader = leader.NewElector(k8sClient, leader.Config{LeaseDuration: 5 * time.Second,
+		startupLeader = leader.NewElector(k8sClient, leader.Config{LeaseDuration: 5 * time.Second,
 			RetryInterval: 2 * time.Second, Namespace: Options.LeaderConfig.Namespace, RenewDeadline: 4 * time.Second},
 			"assisted-service-migration-helper",
 			log.WithField("pkg", "migrationLeader"))
@@ -398,7 +397,7 @@ func main() {
 	case deployment_type_onprem, deployment_type_ocp:
 
 		lead = &leader.DummyElector{}
-		autoMigrationLeader = lead
+		startupLeader = lead
 
 		if Options.DeployTarget == deployment_type_ocp {
 			ocpClient, err = k8sclient.NewK8SClient("", log)
@@ -409,7 +408,7 @@ func main() {
 		log.Fatalf("not supported deploy target %s", Options.DeployTarget)
 	}
 
-	failOnError(autoMigrationWithLeader(autoMigrationLeader, db, log), "Failed auto migration process")
+	failOnError(autoMigrationWithLeader(startupLeader, db, log), "Failed auto migration process")
 
 	Options.UploaderConfig.AssistedServiceVersion = versions.GetRevision()
 	Options.UploaderConfig.Versions = Options.Versions
@@ -443,9 +442,16 @@ func main() {
 	hostStateMonitor.Start()
 	defer hostStateMonitor.Stop()
 
-	addReleaseImagesToDBIfNeeded(db, releaseImagesArray, lead, log, failOnError)
-	openshiftReleaseSyncer := runOpenshiftReleaseSyncerIfNeeded(releaseSourcesArray, releaseImagesArray, db, log, releaseHandler, lead, failOnError)
-	defer stopOpenshiftReleaseSyncerIfNeeded(openshiftReleaseSyncer)
+	failOnError(
+		versions.AddReleaseImagesToDBIfNeeded(db, releaseImagesArray, startupLeader, log, Options.EnableKubeAPI, Options.ReleaseSourcesConfig.ReleaseSources),
+		"error occured while adding configuration release images to the DB if needed",
+	)
+	openshiftReleaseSyncer, err := releasesources.RunOpenshiftReleaseSyncerIfNeeded(
+		releaseSourcesArray, releaseImagesArray, db, log, releaseHandler, lead, startupLeader, Options.EnableKubeAPI, Options.ReleaseSourcesConfig,
+	)
+
+	failOnError(err, "error occured while running OpenShift Release Syncer if needed")
+	defer releasesources.StopOpenshiftReleaseSyncerIfNeeded(openshiftReleaseSyncer)
 
 	newUrl, err := s3wrapper.FixEndpointURL(Options.BMConfig.S3EndpointURL)
 	failOnError(err, "failed to create valid bm config S3 endpoint URL from %s", Options.BMConfig.S3EndpointURL)
@@ -945,107 +951,3 @@ func startPPROF(log *logrus.Logger) {
 		}
 	}
 }
-
-func runOpenshiftReleaseSyncerIfNeeded(
-	releaseSources models.ReleaseSources,
-	releaseImages models.ReleaseImages,
-	db *gorm.DB,
-	log logrus.FieldLogger,
-	releaseHandler oc.Release,
-	lead leader.ElectorInterface,
-	failOnError func(err error, msg string, args ...interface{}),
-) *thread.Thread {
-	if !Options.EnableKubeAPI && Options.ReleaseSourcesConfig.ReleaseSources != "" {
-		releaseSourcesHandler, err := releasesources.NewReleaseSourcesHandler(
-			releaseSources, releaseImages, log, db, Options.ReleaseSourcesConfig, lead,
-		)
-		if err != nil {
-			failOnError(err, "error occurred while creating release sources handler")
-		}
-		log.WithField("pkg", "releasesources").Info("Running Openshift Releases Syncer at startup")
-		err = releaseSourcesHandler.SyncReleaseImages()
-		if err != nil {
-			failOnError(err, "error occurred while syncing release images at startup")
-		}
-
-		openShiftReleaseSyncer := thread.New(
-			log.WithField("pkg", "releasesources"), "Openshift Releases Syncer", Options.ReleaseSourcesConfig.OpenShiftReleaseSyncerInterval, releaseSourcesHandler.SyncReleaseImagesThreadFunc)
-		openShiftReleaseSyncer.Start()
-		return openShiftReleaseSyncer
-	}
-
-	return nil
-}
-
-func stopOpenshiftReleaseSyncerIfNeeded(openShiftReleaseSyncer *thread.Thread) {
-	if openShiftReleaseSyncer != nil {
-		openShiftReleaseSyncer.Stop()
-	}
-}
-
-func addReleaseImagesToDBIfNeeded(
-	db *gorm.DB,
-	releaseImages models.ReleaseImages,
-	lead leader.ElectorInterface,
-	log logrus.FieldLogger,
-	failOnError func(err error, msg string, args ...interface{})) {
-	// If it is kubeAPI mode or release sources was specified (therefore OpenShift Release Syncer will run),
-	// we should not add the release images to the DB.
-	if Options.EnableKubeAPI || Options.ReleaseSourcesConfig.ReleaseSources != "" {
-		return
-	}
-
-	if !lead.IsLeader() {
-		log.Debug("Not a leader, skip adding configuration release images to the DB")
-		return
-	}
-
-	tx := db.Begin()
-
-	var count int64
-	err := tx.Model(&models.ReleaseImage{}).Count(&count).Error
-	failOnError(err, "error occurred while trying to count the initial amount of release images in the DB")
-
-	log.Debugf("Truncating all release_images table. '%d' records", count)
-	if err := tx.Exec("TRUNCATE TABLE release_images").Error; err != nil {
-		tx.Rollback()
-		failOnError(err, "error occurred while trying to delete the release images in the DB")
-	}
-
-	if len(releaseImages) > 0 {
-		log.Debugf("Inserting configuration release images to the DB. '%d' records", len(releaseImages))
-		if err := tx.Create(releaseImages).Error; err != nil {
-			tx.Rollback()
-			failOnError(err, "error occurred while trying to insert the release images to the DB")
-		}
-	}
-
-	if err := tx.Commit().Error; err != nil {
-		tx.Rollback()
-		failOnError(err, "error occurred while commiting changes to the DB")
-	}
-}
-
-func parseIgnoredOpenshiftVersions(ignoredOpenshiftVersions *[]string, failOnError func(err error, msg string, args ...interface{})) {
-	if Options.IgnoredOpenshiftVersions != "" {
-		failOnError(json.Unmarshal([]byte(Options.IgnoredOpenshiftVersions), ignoredOpenshiftVersions),
-			"Failed to parse IGNORED_OPENSHIFT_VERSIONS json %s", Options.IgnoredOpenshiftVersions)
-	}
-}
-
-func parseReleaseImages(releaseImages *models.ReleaseImages, failOnError func(err error, msg string, args ...interface{})) {
-	if Options.ReleaseImages == "" {
-		// ReleaseImages is optional (not used by the operator)
-		return
-	} else {
-		failOnError(json.Unmarshal([]byte(Options.ReleaseImages), releaseImages),
-			"Failed to parse RELEASE_IMAGES json %s", Options.ReleaseImages)
-	}
-
-	// For backward compatibility with release images that lack the CPUArchitectures field.
-	funk.ForEach(*releaseImages, func(releaseImage *models.ReleaseImage) {
-		if releaseImage.CPUArchitectures == nil {
-			releaseImage.CPUArchitectures = []string{*releaseImage.CPUArchitecture}
-		}
-	})
-}

config/manager/manager.yaml

@@ -35,7 +35,7 @@ spec:
           - name: IMAGE_SERVICE_IMAGE
             value: quay.io/edge-infrastructure/assisted-image-service:latest
           - name: DATABASE_IMAGE
-            value: quay.io/centos7/postgresql-12-centos7:latest
+            value: quay.io/sclorg/postgresql-12-c8s:latest
           - name: AGENT_IMAGE
             value: quay.io/edge-infrastructure/assisted-installer-agent:latest
           - name: CONTROLLER_IMAGE

config/manifests/bases/assisted-service-operator.clusterserviceversion.yaml

@@ -158,7 +158,7 @@ spec:
     name: controller
   - image: quay.io/edge-infrastructure/assisted-image-service:latest
     name: image-service
-  - image: quay.io/centos7/postgresql-12-centos7:latest
+  - image: quay.io/sclorg/postgresql-12-c8s:latest
     name: postgresql
   - image: quay.io/edge-infrastructure/assisted-installer:latest
     name: installer

deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml

@@ -981,7 +981,7 @@ spec:
                 - name: IMAGE_SERVICE_IMAGE
                   value: quay.io/edge-infrastructure/assisted-image-service:latest
                 - name: DATABASE_IMAGE
-                  value: quay.io/centos7/postgresql-12-centos7:latest
+                  value: quay.io/sclorg/postgresql-12-c8s:latest
                 - name: AGENT_IMAGE
                   value: quay.io/edge-infrastructure/assisted-installer-agent:latest
                 - name: CONTROLLER_IMAGE
@@ -1119,7 +1119,7 @@ spec:
     name: controller
   - image: quay.io/edge-infrastructure/assisted-image-service:latest
     name: image-service
-  - image: quay.io/centos7/postgresql-12-centos7:latest
+  - image: quay.io/sclorg/postgresql-12-c8s:latest
     name: postgresql
   - image: quay.io/edge-infrastructure/assisted-installer:latest
     name: installer

deploy/podman/pod-persistent-disconnected.yml

@@ -8,7 +8,7 @@ spec:
   containers:
   - args:
     - run-postgresql
-    image: quay.io/centos7/postgresql-12-centos7:latest
+    image: quay.io/sclorg/postgresql-12-c8s:latest
     name: db
     envFrom:
     - configMapRef:

deploy/podman/pod-persistent.yml

@@ -8,7 +8,7 @@ spec:
   containers:
   - args:
     - run-postgresql
-    image: quay.io/centos7/postgresql-12-centos7:latest
+    image: quay.io/sclorg/postgresql-12-c8s:latest
     name: db
     envFrom:
     - configMapRef:

deploy/podman/pod.yml

@@ -8,7 +8,7 @@ spec:
   containers:
   - args:
     - run-postgresql
-    image: quay.io/centos7/postgresql-12-centos7:latest
+    image: quay.io/sclorg/postgresql-12-c8s:latest
     name: db
     envFrom:
     - configMapRef:

deploy/podman/pod_tls.yml

@@ -8,7 +8,7 @@ spec:
   containers:
     - args:
         - run-postgresql
-      image: quay.io/centos7/postgresql-12-centos7:latest
+      image: quay.io/sclorg/postgresql-12-c8s:latest
       name: db
       envFrom:
         - configMapRef:

deploy/postgres/postgres-deployment-ephemeral.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: postgres
-          image: quay.io/centos7/postgresql-12-centos7
+          image: quay.io/sclorg/postgresql-12-c8s
           imagePullPolicy: "IfNotPresent"
           ports:
             - containerPort: 5432

deploy/postgres/postgres-deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: postgres
-          image: quay.io/centos7/postgresql-12-centos7
+          image: quay.io/sclorg/postgresql-12-c8s
           imagePullPolicy: "IfNotPresent"
           ports:
             - containerPort: 5432