release-4.9.0

charts/cdefense/Chart.yaml

@@ -13,9 +13,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 4.8.9
+version: 4.9.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "4.8.9"
+appVersion: "4.9.0"

charts/cdefense/templates/config.yaml

@@ -66,25 +66,10 @@ data:
   CLOUDDEFENSE_WEBCONSOLE_API_ENDPOINT: http://api.cdefense.svc.cluster.local
   {{ end }}
   {{ if .Values.ingress.enabled }}
-  CLOUDDEFENSE_RECOMMENDATIONS_ENDPOINT: {{ if .Values.recommendation.hostname }}"https://{{ .Values.recommendation.hostname }}"{{- else }}"https://recommendation.{{ .Values.domain }}"{{- end }}
-  {{ else }}
-  CLOUDDEFENSE_RECOMMENDATIONS_ENDPOINT: http://recommendation.cdefense.svc.cluster.local
-  {{ end }}
-  {{ if .Values.ingress.enabled }}
   CLOUDDEFENSE_WEBCONSOLE_HOST_URL: https://{{ .Values.hostname }}/project-details
   {{ else }}
   CLOUDDEFENSE_WEBCONSOLE_HOST_URL: http://web.cdefense.svc.cluster.local/project-details
   {{ end }}
-  {{ if .Values.ingress.enabled }}
-  CLOUDDEFENSE_ADMIN_API_URL: https://admin-{{ .Values.hostname }}
-  {{ else }}
-  CLOUDDEFENSE_ADMIN_API_URL: http://admin.cdefense.svc.cluster.local
-  {{ end }}
-  {{ if .Values.ingress.enabled }}
-  CLOUDDEFENSE_ADMIN_UI_URL: https://adminui-{{ .Values.hostname }}
-  {{ else }}
-  CLOUDDEFENSE_ADMIN_UI_URL: http://adminui.cdefense.svc.cluster.local
-  {{ end }}
   CLOUDDEFENSE_WEBCONSOLE_AUTH_STAGE: dockerStaging
   CLOUDDEFENSE_WEBCONSOLE_ONPREM_ENABLED: cdefense
   CUSTOM_VENDOR: ""

charts/cdefense/templates/ingress.yaml

@@ -57,7 +57,6 @@ spec:
   tls:
   - hosts:
     - {{ .Values.hostname }}
-    - {{ if .Values.recommendation.hostname }}"{{ .Values.recommendation.hostname }}"{{- else }}"recommendation.{{ .Values.domain }}"{{- end }}
     # - uptime-{{ .Values.hostname }}
     secretName: cdefense-on-prem-tls
 {{ end }}
@@ -107,31 +106,22 @@ spec:
             name: api
             port:
               number: 80
-      - path: /integration/*
+      - path: /api-v2/*
         pathType: ImplementationSpecific
         backend:
           service:
-            name: api
+            name: newapi
             port:
               number: 80
       {{ if eq .Values.ingress.type "nginx" }}
-      - path: /integrations/*
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: api
-            port:
-              number: 80
-      {{ end }}
-      - path: /api-v2/*
+      - path: /authentication/*
         pathType: ImplementationSpecific
         backend:
           service:
-            name: newapi
+            name: web
             port:
               number: 80
-      {{ if eq .Values.ingress.type "nginx" }}
-      - path: /authentication/*
+      - path: /integrations-list
         pathType: ImplementationSpecific
         backend:
           service:

charts/cdefense/templates/web/deployment.yaml

@@ -38,11 +38,6 @@ spec:
             configMapKeyRef:
                 name: cdefense-config
                 key: CLOUDDEFENSE_WEBCONSOLE_API_ENDPOINT
-        - name: RECOMMENDATIONS_ENDPOINT
-          valueFrom:
-            configMapKeyRef:
-                name: cdefense-config
-                key: CLOUDDEFENSE_RECOMMENDATIONS_ENDPOINT
         - name: API_ENDPOINT
           valueFrom:
             configMapKeyRef: