Skip to content

Commit d6aa25d

Browse files
committed
e2e: set correct versions for OLM overridden bundle
1 parent 00c4573 commit d6aa25d

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

stackgres-k8s/e2e/spec/dbops-security-upgrade-olm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,16 @@ e2e_load_images() {
4242
cat << EOF > "$LOG_PATH/operator-bundle.Dockerfile"
4343
FROM "$BUNDLE_IMAGE_NAME" AS bundle
4444
45-
FROM alpine AS overwrites
45+
FROM debian AS overwrites
4646
COPY --from=bundle / /bundle
4747
RUN sed -i 's|^ name: .*$| name: stackgres.v$BUNDLE_STACKGRES_VERSION|' /bundle/manifests/stackgres.clusterserviceversion.yaml
4848
RUN sed -i 's|^ version: .*$| version: $BUNDLE_STACKGRES_VERSION|' /bundle/manifests/stackgres.clusterserviceversion.yaml
4949
RUN sed -i 's|^ containerImage: quay.io/stackgres/operator:.*$| containerImage: $OPERATOR_IMAGE_NAME|' /bundle/manifests/stackgres.clusterserviceversion.yaml
5050
RUN sed -i 's|^ image: quay.io/stackgres/operator:.*$| image: $OPERATOR_IMAGE_NAME|' /bundle/manifests/stackgres.clusterserviceversion.yaml
51+
RUN sed -i '/name: OPERATOR_VERSION$/{\$!{N;s/name: OPERATOR_VERSION\n\( *\)value: .*$/name: OPERATOR_VERSION\n\1value: "$STACKGRES_VERSION"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
52+
RUN sed -i '/name: OPERATOR_IMAGE_VERSION$/{\$!{N;s/name: OPERATOR_IMAGE_VERSION\n\( *\)value: .*$/name: OPERATOR_IMAGE_VERSION\n\1value: "$IMAGE_TAG"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
53+
RUN sed -i '/name: OPERATOR_JVM_IMAGE_VERSION$/{\$!{N;s/name: OPERATOR_JVM_IMAGE_VERSION\n\( *\)value: .*$/name: OPERATOR_JVM_IMAGE_VERSION\n\1value: "$NATIVE_IMAGE_TAG-jvm"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
54+
RUN sed -i '/name: OPERATOR_NATIVE_IMAGE_VERSION$/{\$!{N;s/name: OPERATOR_NATIVE_IMAGE_VERSION\n\( *\)value: .*$/name: OPERATOR_NATIVE_IMAGE_VERSION\n\1value: "$NATIVE_IMAGE_TAG"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
5155
5256
FROM scratch
5357
COPY --from=overwrites /bundle /

stackgres-k8s/e2e/spec/operator-olm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,12 +501,16 @@ e2e_load_images() {
501501
cat << EOF > "$LOG_PATH/operator-bundle.Dockerfile"
502502
FROM "$BUNDLE_IMAGE_NAME" AS bundle
503503
504-
FROM alpine AS overwrites
504+
FROM debian AS overwrites
505505
COPY --from=bundle / /bundle
506506
RUN sed -i 's|^ name: .*$| name: stackgres.v$BUNDLE_STACKGRES_VERSION|' /bundle/manifests/stackgres.clusterserviceversion.yaml
507507
RUN sed -i 's|^ version: .*$| version: $BUNDLE_STACKGRES_VERSION|' /bundle/manifests/stackgres.clusterserviceversion.yaml
508508
RUN sed -i 's|^ containerImage: quay.io/stackgres/operator:.*$| containerImage: $OPERATOR_IMAGE_NAME|' /bundle/manifests/stackgres.clusterserviceversion.yaml
509509
RUN sed -i 's|^ image: quay.io/stackgres/operator:.*$| image: $OPERATOR_IMAGE_NAME|' /bundle/manifests/stackgres.clusterserviceversion.yaml
510+
RUN sed -i '/name: OPERATOR_VERSION$/{\$!{N;s/name: OPERATOR_VERSION\n\( *\)value: .*$/name: OPERATOR_VERSION\n\1value: "$STACKGRES_VERSION"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
511+
RUN sed -i '/name: OPERATOR_IMAGE_VERSION$/{\$!{N;s/name: OPERATOR_IMAGE_VERSION\n\( *\)value: .*$/name: OPERATOR_IMAGE_VERSION\n\1value: "$IMAGE_TAG"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
512+
RUN sed -i '/name: OPERATOR_JVM_IMAGE_VERSION$/{\$!{N;s/name: OPERATOR_JVM_IMAGE_VERSION\n\( *\)value: .*$/name: OPERATOR_JVM_IMAGE_VERSION\n\1value: "$NATIVE_IMAGE_TAG-jvm"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
513+
RUN sed -i '/name: OPERATOR_NATIVE_IMAGE_VERSION$/{\$!{N;s/name: OPERATOR_NATIVE_IMAGE_VERSION\n\( *\)value: .*$/name: OPERATOR_NATIVE_IMAGE_VERSION\n\1value: "$NATIVE_IMAGE_TAG"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
510514
511515
FROM scratch
512516
COPY --from=overwrites /bundle /

0 commit comments

Comments
 (0)