[WIP] OTA-1975: add products-data container and service to service products.json if present in graph-data image

controllers/names.go

@@ -26,6 +26,8 @@ const (
 	namePullSecret = "pull-secret"
 	// ClusterCAMountDir is the mount path for the dir containing cluster CA
 	ClusterCAMountDir = "/etc/pki/ca-trust/extracted/cluster-ca/"
+	// NameProductsData is the Name property of the products data container
+	NameProductsData = "products-data"
 )
 
 func nameDeployment(instance *cv1.UpdateService) string {
@@ -77,3 +79,7 @@ func getMinAvailablePBD(instance *cv1.UpdateService) intstr.IntOrString {
 	}
 	return minAvailable
 }
+
+func NameProductsDataService(instance *cv1.UpdateService) string {
+	return instance.Name + "-products-data"
+}

controllers/new.go

@@ -99,6 +99,8 @@ type kubeResources struct {
 	pullSecret               *corev1.Secret
 	volumes                  []corev1.Volume
 	graphBuilderVolumeMounts []corev1.VolumeMount
+	productsServiceContainer *corev1.Container
+	productsService          *corev1.Service
 }
 
 func newKubeResources(instance *cv1.UpdateService, image string, pullSecret *corev1.Secret, caConfigMap *corev1.ConfigMap, clusterCA *corev1.ConfigMap) (*kubeResources, error) {
@@ -138,6 +140,8 @@ func newKubeResources(instance *cv1.UpdateService, image string, pullSecret *cor
 	k.policyEngineRoute = k.newPolicyEngineRoute(instance)
 	k.policyEngineOldRoute = k.oldPolicyEngineRoute(instance)
 	k.networkPolicy = k.newNetworkPolicy(instance)
+	k.productsServiceContainer = k.newProductsServiceContainer(instance, image)
+	k.productsService = k.newProductsService(instance)
 	return &k, nil
 }
 
@@ -610,6 +614,7 @@ func (k *kubeResources) newDeployment(instance *cv1.UpdateService) *appsv1.Deplo
 					Containers: []corev1.Container{
 						*k.graphBuilderContainer,
 						*k.policyEngineContainer,
+						*k.productsServiceContainer,
 					},
 				},
 			},
@@ -1031,3 +1036,98 @@ func checksumMap(m map[string]string) (string, error) {
 
 	return fmt.Sprintf("%x", hash.Sum(nil)), nil
 }
+
+func (k *kubeResources) newProductsServiceContainer(instance *cv1.UpdateService, image string) *corev1.Container {
+	return &corev1.Container{
+		Name:            NameProductsData,
+		Image:           image,
+		ImagePullPolicy: corev1.PullIfNotPresent,
+		Command: []string{
+			"/usr/bin/products-service",  // New binary to add to Cincinnati
+		},
+		Args: []string{
+			"--data-directory",
+			"/var/lib/cincinnati/graph-data/products",
+			"--address",
+			"::",
+			"--port",
+			"8082",
+		},
+		Ports: []corev1.ContainerPort{
+			{
+				Name:          "products",
+				ContainerPort: 8082,
+				Protocol:      corev1.ProtocolTCP,
+			},
+		},
+		VolumeMounts: k.newGraphBuilderVolumeMounts(instance),
+		Resources: corev1.ResourceRequirements{
+			Limits: corev1.ResourceList{
+				corev1.ResourceCPU:    *resource.NewMilliQuantity(250, resource.DecimalSI),
+				corev1.ResourceMemory: *resource.NewQuantity(128*1024*1024, resource.BinarySI),
+			},
+			Requests: corev1.ResourceList{
+				corev1.ResourceCPU:    *resource.NewMilliQuantity(50, resource.DecimalSI),
+				corev1.ResourceMemory: *resource.NewQuantity(32*1024*1024, resource.BinarySI),
+			},
+		},
+		LivenessProbe: &corev1.Probe{
+			FailureThreshold:    3,
+			SuccessThreshold:    1,
+			InitialDelaySeconds: 5,
+			PeriodSeconds:       30,
+			TimeoutSeconds:      3,
+			ProbeHandler: corev1.ProbeHandler{
+				HTTPGet: &corev1.HTTPGetAction{
+					Path:   "/healthz",
+					Port:   intstr.FromInt32(8082),
+					Scheme: corev1.URISchemeHTTP,
+				},
+			},
+		},
+		ReadinessProbe: &corev1.Probe{
+			FailureThreshold:    3,
+			SuccessThreshold:    1,
+			InitialDelaySeconds: 3,
+			PeriodSeconds:       30,
+			TimeoutSeconds:      3,
+			ProbeHandler: corev1.ProbeHandler{
+				HTTPGet: &corev1.HTTPGetAction{
+					Path:   "/healthz",
+					Port:   intstr.FromInt32(8082),
+					Scheme: corev1.URISchemeHTTP,
+				},
+			},
+		},
+	}
+  }
+
+  func (k *kubeResources) newProductsService(instance *cv1.UpdateService) *corev1.Service {
+      name := NameProductsDataService(instance)
+      return &corev1.Service{
+          ObjectMeta: metav1.ObjectMeta{
+              Name:      name,
+              Namespace: instance.Namespace,
+              Annotations: map[string]string{
+                  DescriptionAnnotation: "This Service exposes product lifecycle information from the graph-data.",
+              },
+              Labels: map[string]string{
+                  "app": name,
+              },
+          },
+          Spec: corev1.ServiceSpec{
+              Type: corev1.ServiceTypeClusterIP,
+              Ports: []corev1.ServicePort{
+                  {
+                      Name:       "products",
+                      Port:       8082,
+                      TargetPort: intstr.FromInt32(8082),
+                      Protocol:   corev1.ProtocolTCP,
+                  },
+              },
+              Selector: map[string]string{
+                  "deployment": nameDeployment(instance),
+              },
+          },
+      }
+  }

controllers/updateservice_controller.go

@@ -169,6 +169,7 @@ func (r *UpdateServiceReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		r.ensurePodDisruptionBudget,
 		r.ensurePolicyEngineRoute,
 		r.ensureNetworkPolicy,
+		r.ensureProductsDataService,
 	} {
 		err = f(ctx, reqLogger, instanceCopy, resources)
 		if err != nil {
@@ -884,3 +885,15 @@ func (r *UpdateServiceReconciler) SetupWithManager(mgr ctrl.Manager, namespace s
 		).
 		Complete(r)
 }
+
+func (r *UpdateServiceReconciler) ensureProductsDataService(ctx context.Context, reqLogger logr.Logger, instance *cv1.UpdateService, resources *kubeResources) error {
+      service := resources.productsService
+      if err := controllerutil.SetControllerReference(instance, service, r.Scheme); err != nil {
+          return err
+      }
+      if err := r.ensureService(ctx, reqLogger, service); err != nil {
+          handleErr(reqLogger, &instance.Status, "EnsureServiceFailed", err)
+          return err
+      }
+      return nil
+}

dev/Dockerfile

@@ -4,4 +4,8 @@ RUN curl -L -o cincinnati-graph-data.tar.gz https://api.openshift.com/api/upgrad
 
 RUN mkdir -p /var/lib/cincinnati-graph-data && tar xvzf cincinnati-graph-data.tar.gz -C /var/lib/cincinnati-graph-data/ --no-overwrite-dir --no-same-owner
 
+RUN curl -L -o products.json https://access.redhat.com/product-life-cycles/api/v2/products || echo "{}" > products.json
+
+RUN mkdir -p /var/lib/cincinnati-graph-data/products && mv products.json /var/lib/cincinnati-graph-data/products/ || true
+
 CMD ["/bin/bash", "-c" ,"exec cp -rpv /var/lib/cincinnati-graph-data/* /var/lib/cincinnati/graph-data"]