Add galaxy default EE

closes pulp#821

.ci/scripts/local.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-kustomize build config/local | kubectl apply -f -
+kustomize build config/local | kubectl apply --server-side=true -f -
 make manifests generate fmt vet CR_KIND=$1 CR_DOMAIN=$2 CR_PLURAL=$3 APP_IMAGE=$4 WEB_IMAGE=$5
 if [[ "$CI_TEST" == "true" ]] ; then
     make build

CHANGES/821.feature

@@ -0,0 +1 @@
+Added a feature to deploy and sync Galaxy execution environments.

Makefile

@@ -210,7 +210,7 @@ endif
 
 .PHONY: install
 install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/crd | kubectl apply -f -
+	$(KUSTOMIZE) build config/crd | kubectl apply --server-side=true -f -
 
 .PHONY: uninstall
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
@@ -224,7 +224,7 @@ local: kustomize ## Run controller in the K8s cluster specified in ~/.kube/confi
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	cd config/default && $(KUSTOMIZE) edit set namespace ${NAMESPACE}
-	$(KUSTOMIZE) build config/default | kubectl apply -f -
+	$(KUSTOMIZE) build config/default | kubectl apply --server-side=true -f -
 
 .PHONY: undeploy
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.

api/v1alpha1/repo_manager_types.go

@@ -262,6 +262,11 @@ type PulpSpec struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
 	Cache Cache `json:"cache,omitempty"`
 
+	// Galaxy defines the resources that are specific to Galaxy deployments
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
+	Galaxy Galaxy `json:"galaxy,omitempty"`
+
 	// Definition of /etc/pulp/settings.py config file.
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Optional
@@ -732,6 +737,21 @@ type Cache struct {
 	Strategy appsv1.DeploymentStrategy `json:"strategy,omitempty"`
 }
 
+// Galaxy defines the resources that are specific to Galaxy deployments
+type Galaxy struct {
+	// Define if the operator should or should not deploy the default Execution Environments.
+	// Default: false
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
+	DeployEEDefaults bool `json:"deploy_ee_defaults,omitempty"`
+
+	// Name of the ConfigMap with the list of Execution Environments that should be synchronized.
+	// Default: ee-default-images
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
+	EEDefaults string `json:"ee_defaults,omitempty"`
+}
+
 // PulpStatus defines the observed state of Pulp
 type PulpStatus struct {
 	//+operator-sdk:csv:customresourcedefinitions:type=status,xDescriptors={"urn:alm:descriptor:io.kubernetes.conditions"}

config/crd/bases/repo-manager.pulpproject.org_pulps.yaml

@@ -5800,6 +5800,19 @@ spec:
               file_storage_storage_class:
                 description: Storage class to use for the file persistentVolumeClaim
                 type: string
+              galaxy:
+                description: Galaxy defines the resources that are specific to Galaxy
+                  deployments
+                properties:
+                  deploy_ee_defaults:
+                    description: 'Define if the operator should or should not deploy
+                      the default Execution Environments. Default: false'
+                    type: boolean
+                  ee_defaults:
+                    description: 'Name of the ConfigMap with the list of Execution
+                      Environments that should be synchronized. Default: ee-default-images'
+                    type: string
+                type: object
               haproxy_timeout:
                 description: 'The timeout for HAProxy. Default: "180s"'
                 type: string

config/rbac/role.yaml

@@ -51,6 +51,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - batch
+  resources:
+  - cronjobs
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - ""
   resources:

controllers/repo_manager/README.md

@@ -9,6 +9,7 @@
 * [Cache](#cache)
 * [Content](#content)
 * [Database](#database)
+* [Galaxy](#galaxy)
 * [PulpList](#pulplist)
 * [PulpSpec](#pulpspec)
 * [PulpStatus](#pulpstatus)
@@ -106,6 +107,17 @@ Database defines desired state of postgres
 
 [Back to Custom Resources](#custom-resources)
 
+#### Galaxy
+
+Galaxy defines the resources that are specific to Galaxy deployments
+
+| Field | Description | Scheme | Required |
+| ----- | ----------- | ------ | -------- |
+| deploy_ee_defaults | Define if the operator should or should not deploy the default Execution Environments. Default: false | bool | false |
+| ee_defaults | Name of the ConfigMap with the list of Execution Environments that should be synchronized. Default: ee-default-images | string | false |
+
+[Back to Custom Resources](#custom-resources)
+
 #### Pulp
 
 Pulp is the Schema for the pulps API
@@ -175,6 +187,7 @@ PulpSpec defines the desired state of Pulp
 | worker | Worker defines desired state of pulpcore-worker resources | [Worker](#worker) | false |
 | web | Web defines desired state of pulpcore-web (reverse-proxy) resources | [Web](#web) | false |
 | cache | Cache defines desired state of redis resources | [Cache](#cache) | false |
+| galaxy | Galaxy defines the resources that are specific to Galaxy deployments | [Galaxy](#galaxy) | false |
 | pulp_settings | Definition of /etc/pulp/settings.py config file. | runtime.RawExtension | false |
 | image_web | The image name (repo name) for the pulp webserver image. Default: \"quay.io/pulp/pulp-web\" | string | false |
 | image_web_version | The image version for the pulp webserver image. Default: \"stable\" | string | false |

controllers/repo_manager/api.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"os"
 	"strconv"
-	"strings"
 	"time"
 
 	"golang.org/x/text/cases"
@@ -35,7 +34,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 
 	"github.com/go-logr/logr"
-	configv1 "github.com/openshift/api/config/v1"
 	repomanagerv1alpha1 "github.com/pulp/pulp-operator/api/v1alpha1"
 	"github.com/pulp/pulp-operator/controllers"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -789,19 +787,7 @@ func pulpServerSecret(resources FunctionResources) client.Object {
 	}
 
 	// Handling user facing URLs
-	rootUrl := "http://" + resources.Pulp.Name + "-web-svc." + resources.Pulp.Namespace + ".svc.cluster.local:24880"
-	if strings.ToLower(resources.Pulp.Spec.IngressType) == "ingress" {
-		rootUrl = "https://" + resources.Pulp.Spec.IngressHost
-	}
-	if strings.ToLower(resources.Pulp.Spec.IngressType) == "route" {
-		if len(resources.Pulp.Spec.RouteHost) == 0 {
-			ingress := &configv1.Ingress{}
-			resources.RepoManagerReconciler.Get(resources.Context, types.NamespacedName{Name: "cluster"}, ingress)
-			rootUrl = "https://" + resources.Pulp.Name + "." + ingress.Spec.Domain
-		} else {
-			rootUrl = "https://" + resources.Pulp.Spec.RouteHost
-		}
-	}
+	rootUrl := getRootURL(resources)
 
 	// default settings.py configuration
 	var pulp_settings = `DB_ENCRYPTION_KEY = "/etc/pulp/keys/database_fields.symmetric.key"

controllers/repo_manager/controller.go

@@ -24,6 +24,7 @@ import (
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 	appsv1 "k8s.io/api/apps/v1"
+	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
 	policy "k8s.io/api/policy/v1"
@@ -70,6 +71,7 @@ type RepoManagerReconciler struct {
 //+kubebuilder:rbac:groups=core,namespace=pulp-operator-system,resources=configmaps;secrets;services;persistentvolumeclaims,verbs=create;update;patch;delete;watch;get;list;
 //+kubebuilder:rbac:groups="",namespace=pulp-operator-system,resources=events,verbs=create;patch
 //+kubebuilder:rbac:groups=policy,namespace=pulp-operator-system,resources=poddisruptionbudgets,verbs=get;list;create;delete;patch;update;watch
+//+kubebuilder:rbac:groups=batch,namespace=pulp-operator-system,resources=cronjobs,verbs=get;list;watch;create;update;patch;delete
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
@@ -305,6 +307,10 @@ func (r *RepoManagerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return pulpController, err
 	}
 
+	if pulpController, err := galaxy(FunctionResources{ctx, pulp, log, r}); needsRequeue(err, pulpController) {
+		return pulpController, err
+	}
+
 	log.V(1).Info("Running status tasks")
 	pulpController, err = r.pulpStatus(ctx, pulp, log)
 	if needsRequeue(err, pulpController) {
@@ -332,6 +338,7 @@ func (r *RepoManagerReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&corev1.ConfigMap{}).
 		Owns(&policy.PodDisruptionBudget{}).
 		Owns(&corev1.ServiceAccount{}).
+		Owns(&batchv1.CronJob{}, builder.WithPredicates(ignoreCronjobStatus())).
 		Owns(&netv1.Ingress{})
 
 	if IsOpenShift, _ := controllers.IsOpenShift(); IsOpenShift {