Merge pull request #278 from junior/catalogue_hotfix

Catalogue hotfix
oracle-quickstart · Jun 16, 2021 · 496a128 · 496a128
2 parents 8f701b8 + ff45d62
commit 496a128
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/deploy/complete/helm-chart/mushop/charts/catalogue/templates/catalogue-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/catalogue/templates/catalogue-deployment.yaml
@@ -56,4 +56,6 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-      volumes: {{- include "catalogue.volumes" . | nindent 8 }}
+      volumes: {{- include "catalogue.volumes" . | nindent 8 }}
+      securityContext:
+        fsGroup: 687467
diff --git a/deploy/complete/helm-chart/mushop/charts/catalogue/templates/catalogue-svc.yaml b/deploy/complete/helm-chart/mushop/charts/catalogue/templates/catalogue-svc.yaml
@@ -11,4 +11,4 @@ spec:
   ports:
     - port: {{ .Values.service.port }}
       name: http
-      targetPort: 80
+      targetPort: 8080
diff --git a/deploy/complete/helm-chart/mushop/charts/catalogue/values.yaml b/deploy/complete/helm-chart/mushop/charts/catalogue/values.yaml
@@ -7,7 +7,7 @@ image:
 
 dbtools:
   repository: iad.ocir.io/oracle/ateam/mushop-dbtools
-  tag: 1.0.1
+  tag: 19.10.0
   pullPolicy: IfNotPresent
 
 osb: {}

diff --git a/deploy/complete/terraform/chart-values/grafana-values.yaml b/deploy/complete/terraform/chart-values/grafana-values.yaml
@@ -28,6 +28,14 @@ dashboards:
       gnetId: 12658
       revision: 1
       datasource: Prometheus
+    k8s-cluster-autoscaler:
+      gnetId: 3831
+      revision: 1
+      datasource: Prometheus
+    k8s-hpa:
+      gnetId: 10257
+      revision: 1
+      datasource: Prometheus
     k8s-pods:
       gnetId: 6336
       revision: 1
@@ -76,4 +84,4 @@ plugins:
   - grafana-worldmap-panel
   - grafana-piechart-panel
   - btplc-status-dot-panel
-  - grafana-github-datasource
+  - grafana-github-datasource
diff --git a/deploy/complete/terraform/schema.yaml b/deploy/complete/terraform/schema.yaml
@@ -287,7 +287,7 @@ variables:
 
   cluster_autoscaler_max_nodes:
     type: integer
-    title: "Autoscaler: Maximum number of node"
+    title: "Autoscaler: Maximum number of nodes"
     minimum: 1
     maximum: 1000
     required: true

diff --git a/src/catalogue/Dockerfile b/src/catalogue/Dockerfile
@@ -42,13 +42,14 @@ RUN microdnf update && \
     rm -rf /var/cache/dnf && \
     rm -rf /var/cache/yum
 
-RUN groupadd -r app -g $((1000 + $RANDOM)) && \
+RUN groupadd -r app -g 687467 && \
     useradd -u $((1000 + $RANDOM)) -r -g app -m -d /app -s /sbin/nologin -c "App user" app && \
-    chmod 755 /app
+    chmod 755 /app && \
+    chown -R app /usr/lib/oracle
 
 WORKDIR /app
-COPY --from=go-builder /catalogue /app/
-COPY images/ /app/images/
+COPY --from=go-builder --chown=app:app /catalogue /app/
+COPY --chown=app:app images/ /app/images/
 
 VOLUME ["/usr/lib/oracle/${clientVersion}/client64/lib/network/admin/"]
 ## Workaround to support current implementation. Will go away when fix issue #138

diff --git a/src/catalogue/VERSION b/src/catalogue/VERSION
@@ -1 +1 @@
-1.4.2
+1.4.3