Merge branch 'openshift:master' into master

OWNERS_ALIASES

@@ -263,6 +263,7 @@ aliases:
   - bmangoen
   - mayleighnmyers
   - fjglira
+  - yannuil
   maistra-reviewers:
   - jwendell
   - rcernich
@@ -274,12 +275,12 @@ aliases:
   - bmangoen
   - mayleighnmyers
   - fjglira
+  - yannuil
   cspi-qe-ocp-lp:
   - calebevans
   - madunn
   - btjd
   - chetna14manku
-  - ascerra
   - smatula
   - liswang89
   - Sau1506mya

ci-operator/config/Prucek/release/OWNERS

@@ -14,6 +14,7 @@ approvers:
 - jupierce
 - psalajova
 - smg247
+- toma5od
 options: {}
 reviewers:
 - bear-redhat
@@ -24,3 +25,4 @@ reviewers:
 - jmguzik
 - psalajova
 - smg247
+- toma5od

ci-operator/config/kubevirt/hyperconverged-cluster-operator/OWNERS

@@ -7,14 +7,12 @@
 filters:
   .*:
     approvers:
-    - dharmit
     - machadovilaca
     - nunnatsa
     - orenc1
     - sradco
     - tiraboschi
     reviewers:
-    - dharmit
     - machadovilaca
     - nunnatsa
     - orenc1

ci-operator/config/maistra/api/maistra-api-maistra-2.6.yaml

@@ -0,0 +1,59 @@
+build_root:
+  image_stream_tag:
+    name: maistra-builder
+    namespace: ci
+    tag: "2.6"
+  use_build_cache: true
+resources:
+  '*':
+    limits:
+      memory: 2Gi
+    requests:
+      cpu: 100m
+      memory: 200Mi
+tests:
+- as: unit
+  commands: |
+    make test \
+    GOBIN="/gobin" \
+    GOCACHE="/tmp/cache" \
+    GOMODCACHE="/tmp/cache" \
+    XDG_CACHE_HOME="/tmp/cache"
+  container:
+    from: src
+- as: gencheck
+  commands: |
+    make gen-check \
+    GOBIN="/gobin" \
+    GOCACHE="/tmp/cache" \
+    GOMODCACHE="/tmp/cache" \
+    XDG_CACHE_HOME="/tmp/cache"
+  container:
+    from: src
+- as: update-istio
+  commands: |
+    export BUILD_WITH_CONTAINER="0"
+    export XDG_CACHE_HOME="/tmp/cache"
+    export GOCACHE="/tmp/cache"
+    export GOMODCACHE="/tmp/cache"
+    # load test-infra automator.sh script
+    git clone https://github.com/maistra/test-infra.git
+    cd test-infra
+    ./tools/automator.sh \
+      -o maistra \
+      -r istio \
+      -f /creds-github/token \
+      "-c UPDATE_BRANCH=${PULL_BASE_SHA} bin/update_maistra_deps.sh" \
+      '-t [maistra-2.6] Automator: Update maistra/api dependency' \
+      -m update_api_istio-2.6 \
+      -b maistra-2.6
+  container:
+    from: src
+  postsubmit: true
+  secrets:
+  - mount_path: /creds-github
+    name: github-token
+zz_generated_metadata:
+  branch: maistra-2.6
+  org: maistra
+  repo: api

ci-operator/config/netobserv/flowlogs-pipeline/netobserv-flowlogs-pipeline-main.yaml

@@ -2,7 +2,7 @@ base_images:
   ubi:
     name: ubi
     namespace: ocp
-    tag: "8"
+    tag: "9"
 build_root:
   image_stream_tag:
     name: release

ci-operator/config/netobserv/netobserv-ebpf-agent/netobserv-netobserv-ebpf-agent-main.yaml

@@ -2,7 +2,7 @@ base_images:
   ubi:
     name: ubi
     namespace: ocp
-    tag: "8"
+    tag: "9"
 build_root:
   image_stream_tag:
     name: release

ci-operator/config/netobserv/network-observability-operator/netobserv-network-observability-operator-main.yaml

@@ -1,21 +1,29 @@
 base_images:
-  cli-operator-sdk:
-    name: cli-operator-sdk
-    namespace: ocp
-    tag: v1.31.0
   flowlogs-pipeline:
     name: flowlogs-pipeline
     namespace: netobserv
     tag: ci
+  netobserv-ebpf-agent:
+    name: netobserv-ebpf-agent
+    namespace: netobserv
+    tag: ci
+  network-observability-console-plugin:
+    name: network-observability-console-plugin
+    namespace: netobserv
+    tag: ci
+  operator-sdk:
+    name: "4.15"
+    namespace: origin
+    tag: operator-sdk
   ubi:
     name: ubi
     namespace: ocp
-    tag: "8"
+    tag: "9"
 build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.20
+    tag: golang-1.21
 images:
 - dockerfile_path: Dockerfile
   from: ubi
@@ -29,6 +37,10 @@ operator:
     with: network-observability-operator
   - pullspec: quay.io/netobserv/flowlogs-pipeline:.*
     with: pipeline:flowlogs-pipeline
+  - pullspec: quay.io/netobserv/netobserv-ebpf-agent:.*
+    with: pipeline:netobserv-ebpf-agent
+  - pullspec: quay.io/netobserv/network-observability-console-plugin:.*
+    with: pipeline:network-observability-console-plugin
 promotion:
   to:
   - namespace: netobserv
@@ -52,16 +64,31 @@ resources:
       memory: 200Mi
 tests:
 - as: e2e-operator
+  cluster_claim:
+    architecture: amd64
+    cloud: aws
+    owner: openshift-ci
+    product: ocp
+    timeout: 1h0m0s
+    version: "4.15"
   optional: true
   steps:
-    cluster_profile: aws
-    dependencies:
-      OO_BUNDLE: noo-bundle
-    env:
-      OO_INSTALL_MODE: AllNamespaces
-      OO_INSTALL_NAMESPACE: openshift-netobserv-operator
     test:
-    - as: e2e-operator
+    - as: install
+      cli: latest
+      commands: |
+        oc create ns openshift-netobserv-operator
+        oc label --overwrite ns openshift-netobserv-operator security.openshift.io/scc.podSecurityLabelSync=true
+        operator-sdk run bundle "$OO_BUNDLE" -n openshift-netobserv-operator --verbose
+        oc wait deployment --for condition=Available --timeout=120s netobserv-controller-manager -n openshift-netobserv-operator
+      dependencies:
+      - env: OO_BUNDLE
+        name: noo-bundle
+      from: operator-sdk
+      resources:
+        requests:
+          cpu: 100m
+    - as: noo-e2e-flowcollector
       cli: latest
       commands: |
         export PATH=$PATH:$HOME
@@ -71,22 +98,31 @@ tests:
         fi
 
         export CSV=$(oc get csv -n openshift-netobserv-operator | grep -E "net.*observ" | awk '{print $1}')
-        USER=netobserv VERSION=main make set-agent-image
-        USER=netobserv VERSION=main make set-plugin-image
         make set-release-kind-downstream
         PORT_FWD=false NAMESPACE=netobserv make deploy-loki
         oc apply -f /go/src/github.com/netobserv/network-observability-operator/config/samples/flows_v1beta2_flowcollector.yaml
-        sleep 5
 
+        echo "====> Waiting for netobserv-privileged pod to be ready"
+        while : ; do oc get ds netobserv-ebpf-agent -n netobserv-privileged && break; sleep 1; done
+
+        oc wait pods --timeout=120s --for=condition=ready -l app=netobserv-ebpf-agent -n netobserv-privileged
+
+        echo "====> Waiting for flowlogs-pipeline pod to be ready"
         oc wait pods --timeout=120s --for=condition=ready -l app=flowlogs-pipeline -n netobserv
+
+        echo "====> Waiting for console-plugin pod to be ready"
         oc wait -n netobserv --timeout=60s --for condition=Available=True deployment netobserv-plugin
-        oc wait pods --timeout=120s --for=condition=ready -l app=netobserv-ebpf-agent -n netobserv-privileged
+
+        echo "====> Waiting for flowcollector pod to be ready"
         oc wait flowcollector/cluster --timeout=120s --for=condition=ready
+
+        echo "====> Deleting flowcollector"
+        oc delete flowcollector/cluster
       from: src
       resources:
         requests:
           cpu: 100m
-    workflow: optional-operators-ci-operator-sdk-aws
+    workflow: generic-claim
 zz_generated_metadata:
   branch: main
   org: netobserv