Create HPP Direct CRDs always

provision/acc_provision/templates/aci-containers.yaml

@@ -1208,7 +1208,6 @@ spec:
         type: object
 ---
 {% endif %} #}
-{% if config.kube_config.enable_hpp_direct %}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -1371,7 +1370,6 @@ spec:
                           value:
                             type: string
 ---
-{% endif %}
 {% if config.kube_config.proactive_conf %}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -3379,7 +3377,6 @@ and aci-containers-operator images for istio.io/istio package
   - update
   - patch
 {% endif %}
-{% if config.kube_config.enable_hpp_direct %}
 - apiGroups:
   - "aci.hpp"
   resources:
@@ -3392,7 +3389,6 @@ and aci-containers-operator images for istio.io/istio package
   - create
   - update
   - delete
-{% endif %}
 {% if config.kube_config.proactive_conf %}
 - apiGroups:
   - "aci.pc"
@@ -3584,7 +3580,6 @@ rules:
   - list
   - watch
 {% endif %}
-{% if config.kube_config.enable_hpp_direct %}
 - apiGroups:
   - "aci.hpp"
   resources:
@@ -3594,7 +3589,6 @@ rules:
   - list
   - watch
   - get
-{% endif %}
 {% if config.kube_config.proactive_conf %}
 - apiGroups:
   - "aci.pc"

provision/testdata/base_case_tar/cluster-network-19-CustomResourceDefinition-hostprotpols.aci.hpp.yaml

@@ -0,0 +1,99 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: hostprotpols.aci.hpp
+spec:
+  group: aci.hpp
+  names:
+    kind: HostprotPol
+    listKind: HostprotPolList
+    plural: hostprotpols
+    singular: hostprotpol
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object.Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              hostprotSubj:
+                items:
+                  properties:
+                    hostprotRule:
+                      items:
+                        properties:
+                          connTrack:
+                            description: ConnTrack
+                            type: string
+                          direction:
+                            description: Direction
+                            type: string
+                          ethertype:
+                            description: Ethertype
+                            type: string
+                          fromPort:
+                            description: FromPort
+                            type: string
+                          hostprotFilterContainer:
+                            properties:
+                              hostprotFilter:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    operator:
+                                      type: string
+                                    values:
+                                      items:
+                                        type: string
+                                      type: array
+                                  type: object
+                                type: array
+                            type: object
+                          hostprotServiceRemoteIps:
+                            items:
+                              type: string
+                            type: array
+                          name:
+                            type: string
+                          protocol:
+                            description: Protocol
+                            type: string
+                          rsRemoteIpContainer:
+                            items:
+                              type: string
+                            type: array
+                          toPort:
+                            description: ToPort
+                            type: string
+                        type: object
+                      type: array
+                    name:
+                      type: string
+                  type: object
+                type: array
+              name:
+                type: string
+              networkPolicies:
+                items:
+                  type: string
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

provision/testdata/base_case_tar/cluster-network-20-CustomResourceDefinition-hostprotremoteipcontainers.aci.hpp.yaml

@@ -0,0 +1,55 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: hostprotremoteipcontainers.aci.hpp
+spec:
+  group: aci.hpp
+  names:
+    kind: HostprotRemoteIpContainer
+    listKind: HostprotRemoteIpContainerList
+    plural: hostprotremoteipcontainers
+    singular: hostprotremoteipcontainer
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              hostprotRemoteIp:
+                items:
+                  properties:
+                    addr:
+                      type: string
+                    hppEpLabel:
+                      items:
+                        properties:
+                          key:
+                            type: string
+                          value:
+                            type: string
+                        type: object
+                      type: array
+                  type: object
+                type: array
+              name:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

provision/testdata/flavor_k8s_aci_cilium_tar/cluster-network-27-ClusterRole-aci-containers-controller.yaml → provision/testdata/base_case_tar/cluster-network-29-ClusterRole-aci-containers-controller.yaml

@@ -181,3 +181,15 @@ rules:
   - create
   - update
   - delete
+- apiGroups:
+  - aci.hpp
+  resources:
+  - hostprotpols
+  - hostprotremoteipcontainers
+  verbs:
+  - list
+  - watch
+  - get
+  - create
+  - update
+  - delete

provision/testdata/flavor_openshift_410_baremetal_tar/cluster-network-29-ClusterRole-aci-containers-host-agent.yaml → provision/testdata/base_case_tar/cluster-network-30-ClusterRole-aci-containers-host-agent.yaml

@@ -95,12 +95,6 @@ rules:
   - watch
   - get
   - delete
-- apiGroups:
-  - config.openshift.io
-  resources:
-  - infrastructures
-  verbs:
-  - get
 - apiGroups:
   - discovery.k8s.io
   resources:
@@ -123,3 +117,12 @@ rules:
   - nodepodifs
   verbs:
   - '*'
+- apiGroups:
+  - aci.hpp
+  resources:
+  - hostprotpols
+  - hostprotremoteipcontainers
+  verbs:
+  - list
+  - watch
+  - get