diff --git a/controllers/new.go b/controllers/new.go index bb66a6694..598717f2d 100644 --- a/controllers/new.go +++ b/controllers/new.go @@ -190,6 +190,12 @@ func (k *kubeResources) newGraphBuilderService(instance *cv1.UpdateService) *cor TargetPort: intstr.FromInt32(8080), Protocol: corev1.ProtocolTCP, }, + { + Name: "products-data", + Port: 8090, + TargetPort: intstr.FromInt32(8090), + Protocol: corev1.ProtocolTCP, + }, { Name: "status-gb", Port: 9080, @@ -811,6 +817,11 @@ func (k *kubeResources) newGraphBuilderContainer(instance *cv1.UpdateService, im ContainerPort: 8080, Protocol: corev1.ProtocolTCP, }, + { + Name: "products-data", + ContainerPort: 8090, + Protocol: corev1.ProtocolTCP, + }, { Name: "status-gb", ContainerPort: 9080, diff --git a/controllers/testdata/resources/zz_fixture_Test_newKubeResources_deployment.yaml b/controllers/testdata/resources/zz_fixture_Test_newKubeResources_deployment.yaml index 92c3e543c..9833c9c36 100644 --- a/controllers/testdata/resources/zz_fixture_Test_newKubeResources_deployment.yaml +++ b/controllers/testdata/resources/zz_fixture_Test_newKubeResources_deployment.yaml @@ -54,6 +54,9 @@ spec: - containerPort: 8080 name: graph-builder protocol: TCP + - containerPort: 8090 + name: products-data + protocol: TCP - containerPort: 9080 name: status-gb protocol: TCP diff --git a/controllers/testdata/resources/zz_fixture_Test_newKubeResources_graph_builder_service.yaml b/controllers/testdata/resources/zz_fixture_Test_newKubeResources_graph_builder_service.yaml index 67c398db7..16f83c318 100644 --- a/controllers/testdata/resources/zz_fixture_Test_newKubeResources_graph_builder_service.yaml +++ b/controllers/testdata/resources/zz_fixture_Test_newKubeResources_graph_builder_service.yaml @@ -16,6 +16,10 @@ spec: port: 8080 protocol: TCP targetPort: 8080 + - name: products-data + port: 8090 + protocol: TCP + targetPort: 8090 - name: status-gb port: 9080 protocol: TCP diff --git a/dev/Dockerfile b/dev/Dockerfile index ce4ee878f..7de144813 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -4,4 +4,9 @@ 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 [ -f /var/lib/cincinnati-graph-data/products.json ] || \ + curl -L -o /var/lib/cincinnati-graph-data/products.json https://access.redhat.com/product-life-cycles/api/v2/products || \ + echo "{}" > /var/lib/cincinnati-graph-data/products.json + + CMD ["/bin/bash", "-c" ,"exec cp -rpv /var/lib/cincinnati-graph-data/* /var/lib/cincinnati/graph-data"]