feat: remove image variables for falco

Author: kasia-kujawa

bundle.yaml

@@ -498,8 +498,6 @@ spec:
           value: registry.connect.redhat.com/sumologic/kubernetes-fluentd@sha256:362053ce1833aa51db31d36f97458f526d199bcd7efff53486b09e3a02a795ab
         - name: RELATED_IMAGE_FLUENT_BIT
           value: registry.connect.redhat.com/sumologic/fluent-bit@sha256:faa802d22e41f8d67d487e40285fa2a7ea72f9cd49c32ddb80ea34f4d302e220
-        - name: RELATED_IMAGE_FALCO
-          value: registry.connect.redhat.com/sumologic/falco@sha256:e70460e16bee5cfe3140d0e539a38769152d258339b48c8476f74238820746bb
         - name: RELATED_IMAGE_SUMO_UBI_MINIMAL
           value: registry.connect.redhat.com/sumologic/sumo-ubi-minimal@sha256:5d468e602034fd84407429fe83c8cb5e4c9ee07e2073db3969aadc97496a958b
         - name: RELATED_IMAGE_OPENTELEMETRY_COLLECTOR

bundle/manifests/operator.clusterserviceversion.yaml

@@ -457,8 +457,6 @@ spec:
                         value: registry.connect.redhat.com/sumologic/kubernetes-fluentd@sha256:362053ce1833aa51db31d36f97458f526d199bcd7efff53486b09e3a02a795ab
                       - name: RELATED_IMAGE_FLUENT_BIT
                         value: registry.connect.redhat.com/sumologic/fluent-bit@sha256:faa802d22e41f8d67d487e40285fa2a7ea72f9cd49c32ddb80ea34f4d302e220
-                      - name: RELATED_IMAGE_FALCO
-                        value: registry.connect.redhat.com/sumologic/falco@sha256:e70460e16bee5cfe3140d0e539a38769152d258339b48c8476f74238820746bb
                       - name: RELATED_IMAGE_SUMO_UBI_MINIMAL
                         value: registry.connect.redhat.com/sumologic/sumo-ubi-minimal@sha256:5d468e602034fd84407429fe83c8cb5e4c9ee07e2073db3969aadc97496a958b
                       - name: RELATED_IMAGE_OPENTELEMETRY_COLLECTOR

config/manager/manager.yaml

@@ -71,8 +71,6 @@ spec:
             value: registry.connect.redhat.com/sumologic/kubernetes-fluentd@sha256:362053ce1833aa51db31d36f97458f526d199bcd7efff53486b09e3a02a795ab
           - name: RELATED_IMAGE_FLUENT_BIT
             value: registry.connect.redhat.com/sumologic/fluent-bit@sha256:faa802d22e41f8d67d487e40285fa2a7ea72f9cd49c32ddb80ea34f4d302e220
-          - name: RELATED_IMAGE_FALCO
-            value: registry.connect.redhat.com/sumologic/falco@sha256:e70460e16bee5cfe3140d0e539a38769152d258339b48c8476f74238820746bb
           - name: RELATED_IMAGE_SUMO_UBI_MINIMAL
             value: registry.connect.redhat.com/sumologic/sumo-ubi-minimal@sha256:5d468e602034fd84407429fe83c8cb5e4c9ee07e2073db3969aadc97496a958b
           - name: RELATED_IMAGE_OPENTELEMETRY_COLLECTOR

tests/deploy_helm_chart.sh

@@ -53,9 +53,6 @@ helm install test-openshift sumologic/sumologic \
   --set kube-prometheus-stack.prometheus.prometheusSpec.thanos.image=public.ecr.aws/sumologic/thanos@sha256:707e40ee919e4bc3c2edeecdc536acdf8cb67f9e5fc34eaad9d9e4c283438bb1 \
   --set telegraf-operator.image.repository=public.ecr.aws/sumologic/telegraf-operator-ubi \
   --set telegraf-operator.image.sidecarImage=public.ecr.aws/sumologic/telegraf@sha256:8d92cabdd8efbec83475a004209745cc14e877d361cae19ab80a622ebda57e24 \
-  --set falco.image.registry=public.ecr.aws \
-  --set falco.image.repository=sumologic/falco@sha256 \
-  --set falco.image.tag=e70460e16bee5cfe3140d0e539a38769152d258339b48c8476f74238820746bb \
   --set tailing-sidecar-operator.operator.image.repository=ghcr.io/sumologic/tailing-sidecar-operator@sha256 \
   --set tailing-sidecar-operator.operator.image.tag=1d9d902b165596e12a626f5dd2f9d512627b356c3773a04c96df24270a840724 \
   --set tailing-sidecar-operator.sidecar.image.repository=ghcr.io/sumologic/tailing-sidecar@sha256 \

tests/deploy_helm_operator.sh

@@ -13,24 +13,26 @@ readonly NAMESPACE="sumologic-system"
 readonly TIME=900
 
 # Change container registry in bundle.yaml to public.ecr.aws and ghcr.io to not login to registry.connect.redhat.com
-sed -i.bak 's#registry.connect.redhat.com/sumologic/kubernetes-setup#public.ecr.aws/sumologic/kubernetes-setup#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/node-exporter#public.ecr.aws/sumologic/node-exporter#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/kube-state-metrics#public.ecr.aws/sumologic/kube-state-metrics#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/prometheus-operator#public.ecr.aws/sumologic/prometheus-operator#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/prometheus-config-reloader#public.ecr.aws/sumologic/prometheus-config-reloader#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/prometheus#public.ecr.aws/sumologic/prometheus#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/thanos#public.ecr.aws/sumologic/thanos#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/metrics-server#public.ecr.aws/sumologic/metrics-server#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/metrics-server#public.ecr.aws/sumologic/metrics-server#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/kube-rbac-proxy#public.ecr.aws/sumologic/kube-rbac-proxy#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/tailing-sidecar-operator#ghcr.io/sumologic/tailing-sidecar-operator#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/tailing-sidecar#ghcr.io/sumologic/tailing-sidecar#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/telegraf#public.ecr.aws/sumologic/telegraf#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/kubernetes-fluentd#public.ecr.aws/sumologic/kubernetes-fluentd#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/fluent-bit#public.ecr.aws/sumologic/fluent-bit#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/falco#public.ecr.aws/sumologic/falco#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/sumo-ubi-minimal@#public.ecr.aws/sumologic/sumo-ubi-minimal#g' bundle.yaml
-sed -i.bak 's#registry.connect.redhat.com/sumologic/opentelemetry-collector@#public.ecr.aws/sumologic/opentelemetry-collector#g' bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/kubernetes-setup#public.ecr.aws/sumologic/kubernetes-setup#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/node-exporter#public.ecr.aws/sumologic/node-exporter#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/kube-state-metrics#public.ecr.aws/sumologic/kube-state-metrics#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/prometheus-operator#public.ecr.aws/sumologic/prometheus-operator#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/prometheus-config-reloader#public.ecr.aws/sumologic/prometheus-config-reloader#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/prometheus#public.ecr.aws/sumologic/prometheus#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/thanos#public.ecr.aws/sumologic/thanos#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/metrics-server#public.ecr.aws/sumologic/metrics-server#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/metrics-server#public.ecr.aws/sumologic/metrics-server#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/kube-rbac-proxy#public.ecr.aws/sumologic/kube-rbac-proxy#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/tailing-sidecar-operator#ghcr.io/sumologic/tailing-sidecar-operator#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/tailing-sidecar#ghcr.io/sumologic/tailing-sidecar#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/telegraf#public.ecr.aws/sumologic/telegraf#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/kubernetes-fluentd#public.ecr.aws/sumologic/kubernetes-fluentd#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/fluent-bit#public.ecr.aws/sumologic/fluent-bit#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/sumo-ubi-minimal@#public.ecr.aws/sumologic/sumo-ubi-minimal#g" bundle.yaml
+sed -i.bak "s#registry.connect.redhat.com/sumologic/opentelemetry-collector@#public.ecr.aws/sumologic/opentelemetry-collector#g" bundle.yaml
+
+# Change image in bundle.yaml to imag
+sed -i.bak "s#public.ecr.aws/sumologic/sumologic-kubernetes-collection-helm-operator:2.1.4-0-rc.3#${IMG}#g" bundle.yaml
 
 kubectl apply -f bundle.yaml
 

watches.yaml

@@ -34,9 +34,6 @@
     telegraf-operator.image.repository: '{{ ("$RELATED_IMAGE_TELEGRAF_OPERATOR" | split ":")._0 }}'
     telegraf-operator.image.tag: '{{ ("$RELATED_IMAGE_TELEGRAF_OPERATOR" | split ":")._1 }}'
     telegraf-operator.image.sidecarImage: $RELATED_IMAGE_TELEGRAF
-    falco.image.registry: '{{ ("$RELATED_IMAGE_FALCO" | split "/")._0 }}'
-    falco.image.repository: '{{ (("$RELATED_IMAGE_FALCO" | split ":")._0 | split "/")._1 }}/{{ (("$RELATED_IMAGE_FALCO" | split ":")._0 | split "/")._2 }}'
-    falco.image.tag: '{{ ("$RELATED_IMAGE_FALCO" | split ":")._1 }}'
     tailing-sidecar-operator.operator.image.repository: '{{ ("$RELATED_IMAGE_TAILING_SIDECAR_OPERATOR" | split ":")._0 }}'
     tailing-sidecar-operator.operator.image.tag: '{{ ("$RELATED_IMAGE_TAILING_SIDECAR_OPERATOR" | split ":")._1 }}'
     tailing-sidecar-operator.sidecar.image.repository: '{{ ("$RELATED_IMAGE_TAILING_SIDECAR" | split ":")._0 }}'