Merge pull request #47 from Kuadrant/move-kuadrant-resources

Move kuadrant resources to separate kustomization file

Author: david-martin

.github/workflows/ci.yaml

@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Download Kustomize
       run: |
         curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
@@ -55,4 +55,21 @@ jobs:
           if ! make compare-bundles; then
             echo "::error:: Bundles comparison failed. Please run 'make generate-bundles' and check in changes."
             exit 1
-          fi
+          fi
+
+  check-kuadrant-custom-resource-state:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v4
+
+    - name: Execute generation script
+      run: ./hack/gen_kuadrant_custom_resource_state.sh
+
+    - name: Check for changes in generated file
+      run: |
+        if ! git diff --exit-code ./config/kuadrant/custom-resource-state.yaml; then
+          echo "The generated file ./config/kuadrant/custom-resource-state.yaml has changes."
+          echo "Please run './hack/gen_kuadrant_custom_resource_state.sh' locally and check in the changes."
+          exit 1
+        fi

.gitignore

@@ -2,4 +2,5 @@
 bin/*
 
 log/
-/vendor/
+/vendor/
+.vscode/

config/default/custom-resource-state.yaml

@@ -459,204 +459,6 @@ spec:
               parent_namespace: ["parentRef", "namespace"]
               parent_section_name: ["parentRef", "sectionName"]
               parent_port: ["parentRef", "port"]
-    - groupVersionKind:
-        group: kuadrant.io
-        kind: "TLSPolicy"
-        version: "v1alpha1"
-      metricNamePrefix: gatewayapi_tlspolicy
-      labelsFromPath:
-        name:
-        - metadata
-        - name
-        namespace:
-        - metadata
-        - namespace
-      metrics:
-      - name: "labels"
-        help: "Kubernetes labels converted to Prometheus labels."
-        each:
-          type: Info
-          info:
-            path: [metadata]
-            labelsFromPath:
-              "*": [labels]
-      - name: "created"
-        help: "created timestamp"
-        each:
-          type: Gauge
-          gauge:
-            path: [metadata, creationTimestamp]
-      - name: "deleted"
-        help: "deletion timestamp"
-        each:
-          type: Gauge
-          gauge:
-            path: [metadata, deletionTimestamp]
-      - name: "target_info"
-        help: "Target references that the tlspolicy wants to be attached to"
-        each:
-          type: Info
-          info:
-            path: [spec, targetRef]
-            labelsFromPath:
-              target_group: ["group"]
-              target_kind: ["kind"]
-              target_name: ["name"]
-              target_namespace: ["namespace"]
-      - name: "status"
-        help: "status condition"
-        each:
-          type: Gauge
-          gauge:
-            path: [status, conditions]
-            labelsFromPath:
-              type: ["type"]
-            valueFrom: ["status"]
-    - groupVersionKind:
-        group: kuadrant.io
-        kind: "DNSRecord"
-        version: "v1alpha1"
-      metricNamePrefix: kuadrant_dnsrecord            
-      labelsFromPath:
-        name:
-        - metadata
-        - name
-        namespace:
-        - metadata
-        - namespace 
-        rootDomain:
-        - spec
-        - rootHost     
-      metrics:
-      - name: "created"
-        help: "created timestamp"
-        each:
-          type: Gauge
-          gauge:
-            path: [metadata, creationTimestamp]      
-      - name: "status_root_domain_owners"
-        help: "root domain owners (the ids of controllers managing this root domain)"
-        each:
-          type: Info
-          info:
-            path: [status, domainOwners]
-            labelsFromPath:
-              owner: []
-      - name: "status"
-        help: "status condition"
-        each:
-          type: Gauge
-          gauge:
-            path: [status, conditions]
-            labelsFromPath:
-              type: ["type"]
-            valueFrom: ["status"]              
-    - groupVersionKind:
-        group: kuadrant.io
-        kind: "DNSPolicy"
-        version: "v1alpha1"
-      metricNamePrefix: gatewayapi_dnspolicy
-      labelsFromPath:
-        name:
-        - metadata
-        - name
-        namespace:
-        - metadata
-        - namespace
-      metrics:
-      - name: "labels"
-        help: "Kubernetes labels converted to Prometheus labels."
-        each:
-          type: Info
-          info:
-            path: [metadata]
-            labelsFromPath:
-              "*": [labels]
-      - name: "created"
-        help: "created timestamp"
-        each:
-          type: Gauge
-          gauge:
-            path: [metadata, creationTimestamp]
-      - name: "deleted"
-        help: "deletion timestamp"
-        each:
-          type: Gauge
-          gauge:
-            path: [metadata, deletionTimestamp]
-      - name: "target_info"
-        help: "Target references that the dnspolicy wants to be attached to"
-        each:
-          type: Info
-          info:
-            path: [spec, targetRef]
-            labelsFromPath:
-              target_group: ["group"]
-              target_kind: ["kind"]
-              target_name: ["name"]
-              target_namespace: ["namespace"]
-      - name: "status"
-        help: "status condition"
-        each:
-          type: Gauge
-          gauge:
-            path: [status, conditions]
-            labelsFromPath:
-              type: ["type"]
-            valueFrom: ["status"]
-    - groupVersionKind:
-        group: kuadrant.io
-        kind: "RateLimitPolicy"
-        version: "v1beta2"
-      metricNamePrefix: gatewayapi_ratelimitpolicy
-      labelsFromPath:
-        name:
-        - metadata
-        - name
-        namespace:
-        - metadata
-        - namespace
-      metrics:
-      - name: "labels"
-        help: "Kubernetes labels converted to Prometheus labels."
-        each:
-          type: Info
-          info:
-            path: [metadata]
-            labelsFromPath:
-              "*": [labels]
-      - name: "created"
-        help: "created timestamp"
-        each:
-          type: Gauge
-          gauge:
-            path: [metadata, creationTimestamp]
-      - name: "deleted"
-        help: "deletion timestamp"
-        each:
-          type: Gauge
-          gauge:
-            path: [metadata, deletionTimestamp]
-      - name: "target_info"
-        help: "Target references that the tlspolicy wants to be attached to"
-        each:
-          type: Info
-          info:
-            path: [spec, targetRef]
-            labelsFromPath:
-              target_group: ["group"]
-              target_kind: ["kind"]
-              target_name: ["name"]
-              target_namespace: ["namespace"]
-      - name: "status"
-        help: "status condition"
-        each:
-          type: Gauge
-          gauge:
-            path: [status, conditions]
-            labelsFromPath:
-              type: ["type"]
-            valueFrom: ["status"]
     - groupVersionKind:
         group: gateway.networking.k8s.io
         kind: "BackendTLSPolicy"
@@ -701,56 +503,3 @@ spec:
               target_kind: ["kind"]
               target_name: ["name"]
               target_namespace: ["namespace"]
-    - groupVersionKind:
-        group: kuadrant.io
-        kind: "AuthPolicy"
-        version: "v1beta2"
-      metricNamePrefix: gatewayapi_authpolicy
-      labelsFromPath:
-        name:
-        - metadata
-        - name
-        namespace:
-        - metadata
-        - namespace
-      metrics:
-      - name: "labels"
-        help: "Kubernetes labels converted to Prometheus labels."
-        each:
-          type: Info
-          info:
-            path: [metadata]
-            labelsFromPath:
-              "*": [labels]
-      - name: "created"
-        help: "created timestamp"
-        each:
-          type: Gauge
-          gauge:
-            path: [metadata, creationTimestamp]
-      - name: "deleted"
-        help: "deletion timestamp"
-        each:
-          type: Gauge
-          gauge:
-            path: [metadata, deletionTimestamp]
-      - name: "target_info"
-        help: "Target references that the authpolicy wants to be attached to"
-        each:
-          type: Info
-          info:
-            path: [spec, targetRef]
-            labelsFromPath:
-              target_group: ["group"]
-              target_kind: ["kind"]
-              target_name: ["name"]
-              target_namespace: ["namespace"]
-      - name: "status"
-        help: "status condition"
-        each:
-          type: Gauge
-          gauge:
-            path: [status, conditions]
-            labelsFromPath:
-              type: ["type"]
-            valueFrom: ["status"]