s

fluxcd · Dec 16, 2024 · c2d1902 · c2d1902
1 parent 0bdc1ef
commit c2d1902
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 6 deletions.
diff --git a/artifacts/flagger/crd.yaml b/artifacts/flagger/crd.yaml
@@ -526,6 +526,10 @@ spec:
                             required:
                             - name
                             type: object
+                            x-kubernetes-validations:
+                            - message: Must have port for Service reference
+                              rule: '(size(self.group) == 0 && self.kind == ''Service'')
+                                ? has(self.port) : true'
                       required:
                       - backendRef
                     headers:
@@ -891,7 +895,7 @@ spec:
                           type: object
                           additionalProperties:
                             type: string
-                        backendRef: &backendRef
+                        backend: &backend
                           type: object
                           properties:
                             filters:
@@ -1006,6 +1010,11 @@ spec:
                                         required:
                                           - name
                                         type: object
+                                        x-kubernetes-validations:
+                                          - message: Must have port for Service reference
+                                            rule:
+                                              "(size(self.group) == 0 && self.kind
+                                              == 'Service') ? has(self.port) : true"
                                     required:
                                       - backendRef
                                     type: object
@@ -1310,6 +1319,10 @@ spec:
                               required:
                                 - name
                               type: object
+                              x-kubernetes-validations:
+                                - message: Must have port for Service reference
+                                  rule: '(size(self.group) == 0 && self.kind == ''Service'')
+                                    ? has(self.port) : true'
                     canary:
                       description: Metadata to add to the canary service
                       type: object
@@ -1322,7 +1335,7 @@ spec:
                           type: object
                           additionalProperties:
                             type: string
-                        backendRef: *backendRef
+                        backend: *backend
                 skipAnalysis:
                   description: Skip analysis and promote canary
                   type: boolean

diff --git a/charts/flagger/crds/crd.yaml b/charts/flagger/crds/crd.yaml
@@ -526,6 +526,10 @@ spec:
                             required:
                             - name
                             type: object
+                            x-kubernetes-validations:
+                            - message: Must have port for Service reference
+                              rule: '(size(self.group) == 0 && self.kind == ''Service'')
+                                ? has(self.port) : true'
                       required:
                       - backendRef
                     headers:
@@ -891,7 +895,7 @@ spec:
                           type: object
                           additionalProperties:
                             type: string
-                        backendRef: &backendRef
+                        backend: &backend
                           type: object
                           properties:
                             filters:
@@ -1006,6 +1010,11 @@ spec:
                                         required:
                                           - name
                                         type: object
+                                        x-kubernetes-validations:
+                                          - message: Must have port for Service reference
+                                            rule:
+                                              "(size(self.group) == 0 && self.kind
+                                              == 'Service') ? has(self.port) : true"
                                     required:
                                       - backendRef
                                     type: object
@@ -1310,6 +1319,10 @@ spec:
                               required:
                                 - name
                               type: object
+                              x-kubernetes-validations:
+                                - message: Must have port for Service reference
+                                  rule: '(size(self.group) == 0 && self.kind == ''Service'')
+                                    ? has(self.port) : true'
                     canary:
                       description: Metadata to add to the canary service
                       type: object
@@ -1322,7 +1335,7 @@ spec:
                           type: object
                           additionalProperties:
                             type: string
-                        backendRef: *backendRef
+                        backend: *backend
                 skipAnalysis:
                   description: Skip analysis and promote canary
                   type: boolean

diff --git a/kustomize/base/flagger/crd.yaml b/kustomize/base/flagger/crd.yaml
@@ -526,6 +526,10 @@ spec:
                             required:
                             - name
                             type: object
+                            x-kubernetes-validations:
+                            - message: Must have port for Service reference
+                              rule: '(size(self.group) == 0 && self.kind == ''Service'')
+                                ? has(self.port) : true'
                       required:
                       - backendRef
                     headers:
@@ -891,7 +895,7 @@ spec:
                           type: object
                           additionalProperties:
                             type: string
-                        backendRef: &backendRef
+                        backend: &backend
                           type: object
                           properties:
                             filters:
@@ -1006,6 +1010,11 @@ spec:
                                         required:
                                           - name
                                         type: object
+                                        x-kubernetes-validations:
+                                          - message: Must have port for Service reference
+                                            rule:
+                                              "(size(self.group) == 0 && self.kind
+                                              == 'Service') ? has(self.port) : true"
                                     required:
                                       - backendRef
                                     type: object
@@ -1310,6 +1319,10 @@ spec:
                               required:
                                 - name
                               type: object
+                              x-kubernetes-validations:
+                                - message: Must have port for Service reference
+                                  rule: '(size(self.group) == 0 && self.kind == ''Service'')
+                                    ? has(self.port) : true'
                     canary:
                       description: Metadata to add to the canary service
                       type: object
@@ -1322,7 +1335,7 @@ spec:
                           type: object
                           additionalProperties:
                             type: string
-                        backendRef: *backendRef
+                        backend: *backend
                 skipAnalysis:
                   description: Skip analysis and promote canary
                   type: boolean