Merge pull request #21 from fluxcd-community/create-pull-request/patch

fluxcd-community · Dec 16, 2023 · ea909a3 · ea909a3
2 parents b06ecbd + ce8bac1
commit ea909a3
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 0 deletions.
diff --git a/helmrelease-helm-v2beta1.json b/helmrelease-helm-v2beta1.json
@@ -180,6 +180,78 @@
           },
           "type": "array"
         },
+        "driftDetection": {
+          "description": "DriftDetection holds the configuration for detecting and handling differences between the manifest in the Helm storage and the resources currently existing in the cluster. \n Note: this field is provisional to the v2beta2 API, and not actively used by v2beta1 HelmReleases.",
+          "properties": {
+            "ignore": {
+              "description": "Ignore contains a list of rules for specifying which changes to ignore during diffing.",
+              "items": {
+                "description": "IgnoreRule defines a rule to selectively disregard specific changes during the drift detection process.",
+                "properties": {
+                  "paths": {
+                    "description": "Paths is a list of JSON Pointer (RFC 6901) paths to be excluded from consideration in a Kubernetes object.",
+                    "items": {
+                      "type": "string"
+                    },
+                    "type": "array"
+                  },
+                  "target": {
+                    "description": "Target is a selector for specifying Kubernetes objects to which this rule applies. If Target is not set, the Paths will be ignored for all Kubernetes objects within the manifest of the Helm release.",
+                    "properties": {
+                      "annotationSelector": {
+                        "description": "AnnotationSelector is a string that follows the label selection expression https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api It matches with the resource annotations.",
+                        "type": "string"
+                      },
+                      "group": {
+                        "description": "Group is the API group to select resources from. Together with Version and Kind it is capable of unambiguously identifying and/or selecting resources. https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md",
+                        "type": "string"
+                      },
+                      "kind": {
+                        "description": "Kind of the API Group to select resources from. Together with Group and Version it is capable of unambiguously identifying and/or selecting resources. https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md",
+                        "type": "string"
+                      },
+                      "labelSelector": {
+                        "description": "LabelSelector is a string that follows the label selection expression https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api It matches with the resource labels.",
+                        "type": "string"
+                      },
+                      "name": {
+                        "description": "Name to match resources with.",
+                        "type": "string"
+                      },
+                      "namespace": {
+                        "description": "Namespace to select resources from.",
+                        "type": "string"
+                      },
+                      "version": {
+                        "description": "Version of the API Group to select resources from. Together with Group and Kind it is capable of unambiguously identifying and/or selecting resources. https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md",
+                        "type": "string"
+                      }
+                    },
+                    "type": "object",
+                    "additionalProperties": false
+                  }
+                },
+                "required": [
+                  "paths"
+                ],
+                "type": "object",
+                "additionalProperties": false
+              },
+              "type": "array"
+            },
+            "mode": {
+              "description": "Mode defines how differences should be handled between the Helm manifest and the manifest currently applied to the cluster. If not explicitly set, it defaults to DiffModeDisabled.",
+              "enum": [
+                "enabled",
+                "warn",
+                "disabled"
+              ],
+              "type": "string"
+            }
+          },
+          "type": "object",
+          "additionalProperties": false
+        },
         "install": {
           "description": "Install holds the configuration for Helm install actions for this HelmRelease.",
           "properties": {
@@ -940,10 +1012,18 @@
           "description": "LastAttemptedValuesChecksum is the SHA1 checksum of the values of the last reconciliation attempt.",
           "type": "string"
         },
+        "lastHandledForceAt": {
+          "description": "LastHandledForceAt holds the value of the most recent force request value, so a change of the annotation value can be detected. \n Note: this field is provisional to the v2beta2 API, and not actively used by v2beta1 HelmReleases.",
+          "type": "string"
+        },
         "lastHandledReconcileAt": {
           "description": "LastHandledReconcileAt holds the value of the most recent reconcile request value, so a change of the annotation value can be detected.",
           "type": "string"
         },
+        "lastHandledResetAt": {
+          "description": "LastHandledResetAt holds the value of the most recent reset request value, so a change of the annotation value can be detected. \n Note: this field is provisional to the v2beta2 API, and not actively used by v2beta1 HelmReleases.",
+          "type": "string"
+        },
         "lastReleaseRevision": {
           "description": "LastReleaseRevision is the revision of the last successful Helm release.",
           "type": "integer"

diff --git a/provider-notification-v1beta3.json b/provider-notification-v1beta3.json
@@ -39,6 +39,11 @@
           "maxLength": 2048,
           "type": "string"
         },
+        "interval": {
+          "description": "Interval at which to reconcile the Provider with its Secret references. Deprecated and not used in v1beta3.",
+          "pattern": "^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$",
+          "type": "string"
+        },
         "proxy": {
           "description": "Proxy the HTTP/S address of the proxy server.",
           "maxLength": 2048,