Merge pull request #4008 from pacevedom/USHIFT-4534

USHIFT-4534: Add rebase capabilities for gateway api

Author: openshift-merge-bot[bot]

assets/optional/gateway-api/00-openshift_gateway_api_namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openshift-gateway-api

assets/optional/gateway-api/02-gatewayclass.yaml

@@ -0,0 +1,6 @@
+apiVersion: gateway.networking.k8s.io/v1beta1
+kind: GatewayClass
+metadata:
+  name: openshift-gateway-api
+spec:
+  controllerName: openshift.io/gateway-controller

assets/optional/gateway-api/02-istio.yaml

@@ -0,0 +1,18 @@
+apiVersion: sailoperator.io/v1alpha1
+kind: Istio
+metadata:
+  name: openshift-gateway-api
+spec:
+  version: latest
+  namespace: openshift-gateway-api
+  values:
+    pilot:
+      resources:
+        requests:
+          cpu: 50m
+          memory: 100Mi
+      env:
+        PILOT_ENABLE_GATEWAY_CONTROLLER_MODE: "true"
+        PILOT_GATEWAY_API_CONTROLLER_NAME: "openshift.io/gateway-controller"
+        PILOT_GATEWAY_API_DEFAULT_GATEWAYCLASS: "openshift-default"
+        PILOT_ENABLE_GATEWAY_API_GATEWAYCLASS_CONTROLLER: "true"

assets/optional/gateway-api/kustomization.yaml

@@ -0,0 +1,32 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - 00-extensions.istio.io_wasmplugins.yaml
+  - 00-gateway.networking.k8s.io_crds.yaml
+  - 00-networking.istio.io_destinationrules.yaml
+  - 00-networking.istio.io_envoyfilters.yaml
+  - 00-networking.istio.io_gateways.yaml
+  - 00-networking.istio.io_proxyconfigs.yaml
+  - 00-networking.istio.io_serviceentries.yaml
+  - 00-networking.istio.io_sidecars.yaml
+  - 00-networking.istio.io_virtualservices.yaml
+  - 00-networking.istio.io_workloadentries.yaml
+  - 00-networking.istio.io_workloadgroups.yaml
+  - 00-sailoperator.io_istiocnis.yaml
+  - 00-sailoperator.io_istiorevisions.yaml
+  - 00-sailoperator.io_istios.yaml
+  - 00-sailoperator.io_remoteistios.yaml
+  - 00-security.istio.io_authorizationpolicies.yaml
+  - 00-security.istio.io_peerauthentications.yaml
+  - 00-security.istio.io_requestauthentications.yaml
+  - 00-telemetry.istio.io_telemetries.yaml
+  - 00-openshift_gateway_api_namespace.yaml
+  - 01-servicemesh-operator3_apps_v1_deployment.yaml
+  - 01-servicemesh-operator3-metrics-service_v1_service.yaml
+  - 01-servicemesh-operator3_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
+  - 01-servicemesh-operator3_rbac.authorization.k8s.io_v1_clusterrole.yaml
+  - 01-servicemesh-operator3_rbac.authorization.k8s.io_v1_rolebinding.yaml
+  - 01-servicemesh-operator3_rbac.authorization.k8s.io_v1_role.yaml
+  - 01-servicemesh-operator3_v1_serviceaccount.yaml
+  - 02-gatewayclass.yaml
+  - 02-istio.yaml

scripts/auto-rebase/assets.yaml

@@ -300,4 +300,3 @@ assets:
       - file: 05-daemonset.yaml
       - file: release-kube-proxy-aarch64.json
       - file: release-kube-proxy-x86_64.json
-

scripts/auto-rebase/ossm_assets.yaml

@@ -0,0 +1,17 @@
+assets:
+
+  - dir: optional/gateway-api/
+    src: ossm/amd64/
+    no_clean: True
+    files:
+      # Manual Namespace instead of OLM one
+      - file: 00-openshift_gateway_api_namespace.yaml
+        ignore: "Provided by MicroShift"
+      # Gateway class and istio definitions
+      - file: 02-gatewayclass.yaml
+        ignore: "Provided by MicroShift"
+      - file: 02-istio.yaml
+        ignore: "Provided by MicroShift"
+      #TODO
+      - file: kustomization.yaml
+        ignore: "Provided by MicroShift"

scripts/auto-rebase/presubmit.py

@@ -25,6 +25,7 @@
 RECIPE_FILEPATHS = [
     "./scripts/auto-rebase/assets.yaml",
     "./scripts/auto-rebase/lvms_assets.yaml",
+    "./scripts/auto-rebase/ossm_assets.yaml",
 ]