diff --git a/controllers/reconcile.go b/controllers/reconcile.go index 965dbf41..20bd51c3 100644 --- a/controllers/reconcile.go +++ b/controllers/reconcile.go @@ -106,16 +106,10 @@ func populateContainerVolumeMounts(frontendEnvironment *crd.FrontendEnvironment) // This will allow chrome to incorperate the generated nav and fed-modules.json // at run time. This means chrome can merge the config in mixed environments - // We need to have the config mounted in 2 places because of the preview/stable - // split. We need to have the config mounted in the preview and stable directories volumeMounts = append(volumeMounts, v1.VolumeMount{ Name: "config", MountPath: "/opt/app-root/src/build/stable/operator-generated", }) - volumeMounts = append(volumeMounts, v1.VolumeMount{ - Name: "config", - MountPath: "/opt/app-root/src/build/preview/operator-generated", - }) // We generate SSL cert mounts conditionally if frontendEnvironment.Spec.SSL { @@ -683,27 +677,15 @@ func (r *FrontendReconciliation) createAnnotationsAndPopulate(nn types.Namespace func (r *FrontendReconciliation) getFrontendPaths() []string { frontendPaths := r.Frontend.Spec.Frontend.Paths defaultPath := fmt.Sprintf("/apps/%s", r.Frontend.Name) - defaultBetaPath := fmt.Sprintf("/beta/apps/%s", r.Frontend.Name) - defaultPreviewPath := fmt.Sprintf("/preview/apps/%s", r.Frontend.Name) if r.Frontend.Spec.AssetsPrefix != "" { defaultPath = fmt.Sprintf("/%s/%s", r.Frontend.Spec.AssetsPrefix, r.Frontend.Name) - defaultBetaPath = fmt.Sprintf("/beta/%s/%s", r.Frontend.Spec.AssetsPrefix, r.Frontend.Name) - defaultPreviewPath = fmt.Sprintf("/preview/%s/%s", r.Frontend.Spec.AssetsPrefix, r.Frontend.Name) } if !r.Frontend.Spec.Frontend.HasPath(defaultPath) { frontendPaths = append(frontendPaths, defaultPath) } - if !r.Frontend.Spec.Frontend.HasPath(defaultBetaPath) { - frontendPaths = append(frontendPaths, defaultBetaPath) - } - - if !r.Frontend.Spec.Frontend.HasPath(defaultPreviewPath) { - frontendPaths = append(frontendPaths, defaultPreviewPath) - } - return frontendPaths } diff --git a/tests/e2e/basic-frontend/02-assert.yaml b/tests/e2e/basic-frontend/02-assert.yaml index e25c5e85..7fde3128 100644 --- a/tests/e2e/basic-frontend/02-assert.yaml +++ b/tests/e2e/basic-frontend/02-assert.yaml @@ -33,6 +33,4 @@ spec: protocol: TCP volumeMounts: - name: config - mountPath: /opt/app-root/src/build/stable/operator-generated - - name: config - mountPath: /opt/app-root/src/build/preview/operator-generated + mountPath: /opt/app-root/src/build/stable/operator-generated \ No newline at end of file diff --git a/tests/e2e/bundles/02-assert.yaml b/tests/e2e/bundles/02-assert.yaml index e8a28c84..ce250ff5 100644 --- a/tests/e2e/bundles/02-assert.yaml +++ b/tests/e2e/bundles/02-assert.yaml @@ -36,8 +36,6 @@ spec: mountPath: /opt/app-root/src/build/chrome - name: config mountPath: /opt/app-root/src/build/stable/operator-generated - - name: config - mountPath: /opt/app-root/src/build/preview/operator-generated --- apiVersion: cloud.redhat.com/v1alpha1 kind: Bundle diff --git a/tests/e2e/cachebust/02-assert.yaml b/tests/e2e/cachebust/02-assert.yaml index 2e85c388..bb3e8d1d 100644 --- a/tests/e2e/cachebust/02-assert.yaml +++ b/tests/e2e/cachebust/02-assert.yaml @@ -37,8 +37,6 @@ spec: volumeMounts: - name: config mountPath: /opt/app-root/src/build/stable/operator-generated - - name: config - mountPath: /opt/app-root/src/build/preview/operator-generated terminationMessagePath: /dev/termination-log terminationMessagePolicy: File imagePullPolicy: IfNotPresent @@ -118,8 +116,6 @@ spec: volumeMounts: - name: config mountPath: /opt/app-root/src/build/stable/operator-generated - - name: config - mountPath: /opt/app-root/src/build/preview/operator-generated terminationMessagePath: /dev/termination-log terminationMessagePolicy: File imagePullPolicy: IfNotPresent @@ -200,5 +196,3 @@ spec: volumeMounts: - name: config mountPath: /opt/app-root/src/build/stable/operator-generated - - name: config - mountPath: /opt/app-root/src/build/preview/operator-generated diff --git a/tests/e2e/cachebust/04-assert.yaml b/tests/e2e/cachebust/04-assert.yaml index b992c0b3..203770a0 100644 --- a/tests/e2e/cachebust/04-assert.yaml +++ b/tests/e2e/cachebust/04-assert.yaml @@ -37,8 +37,6 @@ spec: volumeMounts: - name: config mountPath: /opt/app-root/src/build/stable/operator-generated - - name: config - mountPath: /opt/app-root/src/build/preview/operator-generated terminationMessagePath: /dev/termination-log terminationMessagePolicy: File imagePullPolicy: IfNotPresent @@ -118,8 +116,6 @@ spec: volumeMounts: - name: config mountPath: /opt/app-root/src/build/stable/operator-generated - - name: config - mountPath: /opt/app-root/src/build/preview/operator-generated terminationMessagePath: /dev/termination-log terminationMessagePolicy: File imagePullPolicy: IfNotPresent @@ -200,5 +196,3 @@ spec: volumeMounts: - name: config mountPath: /opt/app-root/src/build/stable/operator-generated - - name: config - mountPath: /opt/app-root/src/build/preview/operator-generated diff --git a/tests/e2e/frontend-paths/02-assert.yaml b/tests/e2e/frontend-paths/02-assert.yaml index d755beaf..08086eb4 100644 --- a/tests/e2e/frontend-paths/02-assert.yaml +++ b/tests/e2e/frontend-paths/02-assert.yaml @@ -33,18 +33,3 @@ spec: name: chrome port: number: 8000 - - path: /beta/apps/chrome - pathType: Prefix - backend: - service: - name: chrome - port: - number: 8000 - - path: /preview/apps/chrome - pathType: Prefix - backend: - service: - name: chrome - port: - number: 8000 - diff --git a/tests/e2e/generate-nav-json/02-assert.yaml b/tests/e2e/generate-nav-json/02-assert.yaml index a347fec4..f82e43e7 100644 --- a/tests/e2e/generate-nav-json/02-assert.yaml +++ b/tests/e2e/generate-nav-json/02-assert.yaml @@ -36,6 +36,3 @@ spec: mountPath: /opt/app-root/src/build/chrome - name: config mountPath: /opt/app-root/src/build/stable/operator-generated - - name: config - mountPath: /opt/app-root/src/build/preview/operator-generated - diff --git a/tests/e2e/networking/02-assert.yaml b/tests/e2e/networking/02-assert.yaml index daba07ba..7bd11505 100644 --- a/tests/e2e/networking/02-assert.yaml +++ b/tests/e2e/networking/02-assert.yaml @@ -32,20 +32,6 @@ spec: name: chrome port: number: 8000 - - path: /beta/apps/chrome - pathType: Prefix - backend: - service: - name: chrome - port: - number: 8000 - - path: /preview/apps/chrome - pathType: Prefix - backend: - service: - name: chrome - port: - number: 8000 --- kind: Service apiVersion: v1 diff --git a/tests/e2e/ssl/02-assert.yaml b/tests/e2e/ssl/02-assert.yaml index 5504e539..06100fd0 100644 --- a/tests/e2e/ssl/02-assert.yaml +++ b/tests/e2e/ssl/02-assert.yaml @@ -43,7 +43,5 @@ spec: volumeMounts: - name: config mountPath: /opt/app-root/src/build/stable/operator-generated - - name: config - mountPath: /opt/app-root/src/build/preview/operator-generated - name: certs mountPath: /opt/certs diff --git a/tests/e2e/storage/02-assert.yaml b/tests/e2e/storage/02-assert.yaml index 9098531b..fbea6f6f 100644 --- a/tests/e2e/storage/02-assert.yaml +++ b/tests/e2e/storage/02-assert.yaml @@ -34,8 +34,6 @@ spec: volumeMounts: - mountPath: /opt/app-root/src/build/stable/operator-generated name: config - - mountPath: /opt/app-root/src/build/preview/operator-generated - name: config securityContext: {} terminationGracePeriodSeconds: 30 volumes: diff --git a/tests/e2e/whitelist/02-assert.yaml b/tests/e2e/whitelist/02-assert.yaml index 6c2ade30..f9b0617f 100644 --- a/tests/e2e/whitelist/02-assert.yaml +++ b/tests/e2e/whitelist/02-assert.yaml @@ -34,8 +34,6 @@ spec: volumeMounts: - name: config mountPath: /opt/app-root/src/build/stable/operator-generated - - name: config - mountPath: /opt/app-root/src/build/preview/operator-generated --- kind: Ingress apiVersion: networking.k8s.io/v1