Update for v1 of Kuadrant CRDs

Signed-off-by: David Martin <davmarti@redhat.com>
Kuadrant · Nov 13, 2024 · 8fee8f8 · 8fee8f8
1 parent b5685c8
commit 8fee8f8
Show file tree

Hide file tree

Showing 13 changed files with 6,551 additions and 1,462 deletions.
diff --git a/config/examples/kube-prometheus/bundle.yaml b/config/examples/kube-prometheus/bundle.yaml
@@ -1491,7 +1491,7 @@ data:
         - groupVersionKind:
             group: kuadrant.io
             kind: "TLSPolicy"
-            version: "v1alpha1"
+            version: "v1"
           metricNamePrefix: gatewayapi_tlspolicy
           labelsFromPath:
             name:
@@ -1544,7 +1544,7 @@ data:
         - groupVersionKind:
             group: kuadrant.io
             kind: "DNSPolicy"
-            version: "v1alpha1"
+            version: "v1"
           metricNamePrefix: gatewayapi_dnspolicy
           labelsFromPath:
             name:
@@ -1597,7 +1597,7 @@ data:
         - groupVersionKind:
             group: kuadrant.io
             kind: "RateLimitPolicy"
-            version: "v1beta2"
+            version: "v1"
           metricNamePrefix: gatewayapi_ratelimitpolicy
           labelsFromPath:
             name:
@@ -1650,7 +1650,7 @@ data:
         - groupVersionKind:
             group: kuadrant.io
             kind: "AuthPolicy"
-            version: "v1beta2"
+            version: "v1"
           metricNamePrefix: gatewayapi_authpolicy
           labelsFromPath:
             name:

diff --git a/config/kuadrant/crd/kuadrant.io_authpolicies.yaml b/config/kuadrant/crd/kuadrant.io_authpolicies.yaml
diff --git a/config/kuadrant/crd/kuadrant.io_dnspolicies.yaml b/config/kuadrant/crd/kuadrant.io_dnspolicies.yaml
diff --git a/config/kuadrant/crd/kuadrant.io_ratelimitpolicies.yaml b/config/kuadrant/crd/kuadrant.io_ratelimitpolicies.yaml
diff --git a/config/kuadrant/crd/kuadrant.io_tlspolicies.yaml b/config/kuadrant/crd/kuadrant.io_tlspolicies.yaml
diff --git a/config/kuadrant/custom-resource-state-kuadrant.yaml b/config/kuadrant/custom-resource-state-kuadrant.yaml
@@ -1,7 +1,7 @@
     - groupVersionKind:
         group: kuadrant.io
         kind: "TLSPolicy"
-        version: "v1alpha1"
+        version: "v1"
       metricNamePrefix: gatewayapi_tlspolicy
       labelsFromPath:
         name:
@@ -54,7 +54,7 @@
     - groupVersionKind:
         group: kuadrant.io
         kind: "DNSPolicy"
-        version: "v1alpha1"
+        version: "v1"
       metricNamePrefix: gatewayapi_dnspolicy
       labelsFromPath:
         name:
@@ -107,7 +107,7 @@
     - groupVersionKind:
         group: kuadrant.io
         kind: "RateLimitPolicy"
-        version: "v1beta2"
+        version: "v1"
       metricNamePrefix: gatewayapi_ratelimitpolicy
       labelsFromPath:
         name:
@@ -160,7 +160,7 @@
     - groupVersionKind:
         group: kuadrant.io
         kind: "AuthPolicy"
-        version: "v1beta2"
+        version: "v1"
       metricNamePrefix: gatewayapi_authpolicy
       labelsFromPath:
         name:

diff --git a/config/kuadrant/custom-resource-state.yaml b/config/kuadrant/custom-resource-state.yaml
@@ -506,7 +506,7 @@ spec:
     - groupVersionKind:
         group: kuadrant.io
         kind: "TLSPolicy"
-        version: "v1alpha1"
+        version: "v1"
       metricNamePrefix: gatewayapi_tlspolicy
       labelsFromPath:
         name:
@@ -559,7 +559,7 @@ spec:
     - groupVersionKind:
         group: kuadrant.io
         kind: "DNSPolicy"
-        version: "v1alpha1"
+        version: "v1"
       metricNamePrefix: gatewayapi_dnspolicy
       labelsFromPath:
         name:
@@ -612,7 +612,7 @@ spec:
     - groupVersionKind:
         group: kuadrant.io
         kind: "RateLimitPolicy"
-        version: "v1beta2"
+        version: "v1"
       metricNamePrefix: gatewayapi_ratelimitpolicy
       labelsFromPath:
         name:
@@ -665,7 +665,7 @@ spec:
     - groupVersionKind:
         group: kuadrant.io
         kind: "AuthPolicy"
-        version: "v1beta2"
+        version: "v1"
       metricNamePrefix: gatewayapi_authpolicy
       labelsFromPath:
         name:

diff --git a/config/kuadrant/kuadrant.yaml b/config/kuadrant/kuadrant.yaml
@@ -1,4 +1,4 @@
-apiVersion: kuadrant.io/v1alpha1
+apiVersion: kuadrant.io/v1
 kind: TLSPolicy
 metadata:
   name: external
@@ -20,7 +20,7 @@ status:
     status: "True"
     type: Ready
 ---
-apiVersion: kuadrant.io/v1alpha1
+apiVersion: kuadrant.io/v1
 kind: TLSPolicy
 metadata:
   name: internal
@@ -42,12 +42,18 @@ status:
     status: "True"
     type: Ready
 ---
-apiVersion: kuadrant.io/v1alpha1
+apiVersion: kuadrant.io/v1
 kind: DNSPolicy
 metadata:
   name: external
   namespace: istio-system
 spec:
+  loadBalancing:
+    defaultGeo: true
+    geo: US
+    weight: 120
+  providerRefs:
+    - name: aws-credentials
   targetRef:
     group: gateway.networking.k8s.io
     kind: Gateway
@@ -61,7 +67,7 @@ status:
     type: Ready
   observedGeneration: 1
 ---
-apiVersion: kuadrant.io/v1beta2
+apiVersion: kuadrant.io/v1
 kind: RateLimitPolicy
 metadata:
   name: rlp-www
@@ -71,11 +77,18 @@ spec:
     kind: HTTPRoute
     name: www
   limits:
-    "global":
+    alice-limit:
       rates:
-      - limit: 5
-        duration: 10
-        unit: second
+        - limit: 5
+          window: 10s
+      when:
+        - predicate: auth.identity.userid == 'alice'
+    bob-limit:
+      rates:
+        - limit: 2
+          window: 10s
+      when:
+        - predicate: auth.identity.userid == 'bob'
 status:
   conditions:
   - lastTransitionTime: "2023-08-21T22:53:08Z"
@@ -84,7 +97,7 @@ status:
     status: "True"
     type: Available
 ---
-apiVersion: kuadrant.io/v1beta2
+apiVersion: kuadrant.io/v1
 kind: RateLimitPolicy
 metadata:
   name: rlp-cdn
@@ -94,11 +107,18 @@ spec:
     kind: HTTPRoute
     name: cdn
   limits:
-    "global":
+    alice-limit:
+      rates:
+        - limit: 5
+          window: 10s
+      when:
+        - predicate: auth.identity.userid == 'alice'
+    bob-limit:
       rates:
-      - limit: 5
-        duration: 10
-        unit: second
+        - limit: 2
+          window: 10s
+      when:
+        - predicate: auth.identity.userid == 'bob'
 status:
   conditions:
   - lastTransitionTime: "2023-08-21T22:53:08Z"
@@ -107,7 +127,7 @@ status:
     status: "True"
     type: Available
 ---
-apiVersion: kuadrant.io/v1beta2
+apiVersion: kuadrant.io/v1
 kind: AuthPolicy
 metadata:
   name: dashboards-protection
@@ -118,29 +138,27 @@ spec:
     name: dashboards
   rules:
     authentication:
-      "keycloak-users":
-        jwt:
-          issuerUrl: http://keycloak.example.com
-      "k8s-service-accounts":
-        kubernetesTokenReview:
-          audiences:
-          - https://kubernetes.example.com
-        overrides:
-          "sub":
-            selector: auth.identity.user.username
-    authorization:
-      "k8s-rbac":
-        kubernetesSubjectAccessReview:
-          user:
-            selector: auth.identity.sub
+      api-key-users:
+        apiKey:
+          allNamespaces: true
+          selector:
+            matchLabels:
+              app: toystore
+        credentials:
+          authorizationHeader:
+            prefix: APIKEY
+        metrics: false
+        priority: 0
     response:
       success:
-        dynamicMetadata:
-          "identity":
+        filters:
+          identity:
             json:
               properties:
-                "userid":
-                  selector: auth.identity.sub
+                userid:
+                  selector: auth.identity.metadata.annotations.secret\.kuadrant\.io/user-id
+            metrics: false
+            priority: 0
 status:
   conditions:
   - lastTransitionTime: "2023-08-21T22:53:08Z"
@@ -149,7 +167,7 @@ status:
     status: "True"
     type: Available
 ---
-apiVersion: kuadrant.io/v1beta2
+apiVersion: kuadrant.io/v1
 kind: AuthPolicy
 metadata:
   name: accounts
@@ -160,23 +178,27 @@ spec:
     name: accounts
   rules:
     authentication:
-      "api-key-users":
+      api-key-users:
         apiKey:
+          allNamespaces: true
           selector:
             matchLabels:
-              app: accounts
-          allNamespaces: true
+              app: toystore
         credentials:
           authorizationHeader:
             prefix: APIKEY
+        metrics: false
+        priority: 0
     response:
       success:
-        dynamicMetadata:
-          "identity":
+        filters:
+          identity:
             json:
               properties:
-                "userid":
+                userid:
                   selector: auth.identity.metadata.annotations.secret\.kuadrant\.io/user-id
+            metrics: false
+            priority: 0
 status:
   conditions:
   - lastTransitionTime: "2023-08-21T22:53:08Z"