use computed provider version within the deployment name for uniqueness

apis/pipelines/v1alpha6/status.go

@@ -60,4 +60,5 @@ type Status struct {
 	Version              string                    `json:"version,omitempty"`
 	ObservedGeneration   int64                     `json:"observedGeneration,omitempty"`
 	Conditions           Conditions                `json:"conditions,omitempty"`
+	Serving              string                    `json:"serving,omitempty"`
 }

controllers/pipelines/provider_controller.go

@@ -49,9 +49,10 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	logger.V(2).Info("found provider", "resource", provider)
+	providerVersion := provider.ComputeVersion()
+	logger.V(2).Info("found provider", "resource", provider, "version", providerVersion)
 
-	providerServiceName := fmt.Sprintf("provider-%s-service", req.Name)
+	providerServiceName := fmt.Sprintf("provider-%s-service-%s", req.Name, providerVersion)
 	providerServiceDeployment, err := r.fetchProviderServiceDeployment(ctx, providerServiceName, req.Namespace)
 	if err != nil {
 		logger.Error(err, "unable to fetch provider service deployment")
@@ -107,27 +108,27 @@ func constructProviderDeployment(name, namespace string, provider *pipelinesv1.P
 
 	podTemplate := config.DefaultProviderValues.PodTemplateSpec
 
-	const targetContainer = "provider-service"
+	const targetContainer = "provider-service" //TODO: make configurable from config
 	for _, container := range podTemplate.Spec.Containers {
 		if container.Name == targetContainer {
 			container.Image = provider.Spec.Image
 			container.Env = append(container.Env, v1.EnvVar{
 				Name:  "PROVIDERNAME",
-				Value: name,
+				Value: provider.Name,
 			})
 		}
 	}
 
 	const providerLabelKey = "provider"
-	podTemplate.ObjectMeta.Labels[providerLabelKey] = provider.GetName()
+	podTemplate.ObjectMeta.Labels[providerLabelKey] = provider.Name
 	podTemplate.Spec.ServiceAccountName = provider.Spec.ServiceAccount
 
 	labels := config.DefaultProviderValues.Labels
-	labels[providerLabelKey] = provider.GetName()
+	labels[providerLabelKey] = provider.Name
 
 	return &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
+			Name:      fmt.Sprintf("provider-%s", name),
 			Namespace: namespace,
 			Labels:    labels,
 		},