Merge pull request #553 from PennyScissors/update-gatekeeper

Update gatekeeper to v3.1.0-rc.1

packages/rancher-gatekeeper/package.yaml

@@ -1,7 +1,7 @@
 url: https://github.com/open-policy-agent/gatekeeper.git
 subdirectory: charts/gatekeeper
 type: git
-commit: 9a8051ac8fa3dc407056ed0293a0d97210386115
+commit: 58ae7eacd2f93831b55557d0cd56ffdc3e04ab9a
 generateCRDChart:
   enabled: true
   providesGVR: configs.config.gatekeeper.sh/v1alpha1

packages/rancher-gatekeeper/rancher-gatekeeper.patch

@@ -8,11 +8,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/Cha
 +name: rancher-gatekeeper
  keywords:
    - open policy agent
- version: v3.1.0-beta.11
+ version: v3.1.0-rc.1
 @@ -8,3 +8,9 @@
  sources:
    - https://github.com/open-policy-agent/gatekeeper.git
- appVersion: v3.1.0-beta.11
+ appVersion: v3.1.0-rc.1
 +icon: https://charts.rancher.io/assets/logos/gatekeeper.svg
 +annotations:
 +  catalog.cattle.io/certified: rancher
@@ -22,7 +22,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/Cha
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crds/config-customresourcedefinition.yaml packages/rancher-gatekeeper/charts/crds/config-customresourcedefinition.yaml
 --- packages/rancher-gatekeeper/charts-original/crds/config-customresourcedefinition.yaml
 +++ packages/rancher-gatekeeper/charts/crds/config-customresourcedefinition.yaml
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,111 @@
 +apiVersion: apiextensions.k8s.io/v1beta1
 +kind: CustomResourceDefinition
 +metadata:
@@ -52,14 +52,10 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 +      description: Config is the Schema for the configs API
 +      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'
++          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'
++          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
@@ -90,8 +86,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 +              description: Configuration for syncing k8s objects
 +              properties:
 +                syncOnly:
-+                  description: If non-empty, only entries on this list will be replicated
-+                    into OPA
++                  description: If non-empty, only entries on this list will be replicated into OPA
 +                  items:
 +                    properties:
 +                      group:
@@ -107,13 +102,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 +              description: Configuration for validation
 +              properties:
 +                traces:
-+                  description: List of requests to trace. Both "user" and "kinds"
-+                    must be specified
++                  description: List of requests to trace. Both "user" and "kinds" must be specified
 +                  items:
 +                    properties:
 +                      dump:
-+                        description: Also dump the state of OPA with the trace. Set
-+                          to `All` to dump everything.
++                        description: Also dump the state of OPA with the trace. Set to `All` to dump everything.
 +                        type: string
 +                      kind:
 +                        description: Only trace requests of the following GroupVersionKind
@@ -144,7 +137,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crds/constraintpodstatus-customresourcedefinition.yaml packages/rancher-gatekeeper/charts/crds/constraintpodstatus-customresourcedefinition.yaml
 --- packages/rancher-gatekeeper/charts-original/crds/constraintpodstatus-customresourcedefinition.yaml
 +++ packages/rancher-gatekeeper/charts/crds/constraintpodstatus-customresourcedefinition.yaml
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,78 @@
 +apiVersion: apiextensions.k8s.io/v1beta1
 +kind: CustomResourceDefinition
 +metadata:
@@ -168,18 +161,13 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 +  scope: Namespaced
 +  validation:
 +    openAPIV3Schema:
-+      description: ConstraintPodStatus is the Schema for the constraintpodstatuses
-+        API
++      description: ConstraintPodStatus is the Schema for the constraintpodstatuses API
 +      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'
++          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'
++          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
@@ -187,16 +175,13 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 +          description: ConstraintPodStatusStatus defines the observed state of ConstraintPodStatus
 +          properties:
 +            constraintUID:
-+              description: Storing the constraint UID allows us to detect drift, such
-+                as when a constraint has been recreated after its CRD was deleted
-+                out from under it, interrupting the watch
++              description: Storing the constraint UID allows us to detect drift, such as when a constraint has been recreated after its CRD was deleted out from under it, interrupting the watch
 +              type: string
 +            enforced:
 +              type: boolean
 +            errors:
 +              items:
-+                description: Error represents a single error caught while adding a
-+                  constraint to OPA
++                description: Error represents a single error caught while adding a constraint to OPA
 +                properties:
 +                  code:
 +                    type: string
@@ -234,7 +219,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crds/constrainttemplate-customresourcedefinition.yaml packages/rancher-gatekeeper/charts/crds/constrainttemplate-customresourcedefinition.yaml
 --- packages/rancher-gatekeeper/charts-original/crds/constrainttemplate-customresourcedefinition.yaml
 +++ packages/rancher-gatekeeper/charts/crds/constrainttemplate-customresourcedefinition.yaml
-@@ -0,0 +1,110 @@
+@@ -0,0 +1,106 @@
 +apiVersion: apiextensions.k8s.io/v1beta1
 +kind: CustomResourceDefinition
 +metadata:
@@ -263,14 +248,10 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 +    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'
++          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'
++          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
@@ -348,7 +329,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crds/constrainttemplatepodstatus-customresourcedefinition.yaml packages/rancher-gatekeeper/charts/crds/constrainttemplatepodstatus-customresourcedefinition.yaml
 --- packages/rancher-gatekeeper/charts-original/crds/constrainttemplatepodstatus-customresourcedefinition.yaml
 +++ packages/rancher-gatekeeper/charts/crds/constrainttemplatepodstatus-customresourcedefinition.yaml
-@@ -0,0 +1,88 @@
+@@ -0,0 +1,77 @@
 +apiVersion: apiextensions.k8s.io/v1beta1
 +kind: CustomResourceDefinition
 +metadata:
@@ -372,29 +353,22 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 +  scope: Namespaced
 +  validation:
 +    openAPIV3Schema:
-+      description: ConstraintTemplatePodStatus is the Schema for the constrainttemplatepodstatuses
-+        API
++      description: ConstraintTemplatePodStatus is the Schema for the constrainttemplatepodstatuses API
 +      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'
++          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'
++          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
 +        status:
-+          description: ConstraintTemplatePodStatusStatus defines the observed state
-+            of ConstraintTemplatePodStatus
++          description: ConstraintTemplatePodStatusStatus defines the observed state of ConstraintTemplatePodStatus
 +          properties:
 +            errors:
 +              items:
-+                description: CreateCRDError represents a single error caught during
-+                  parsing, compiling, etc.
++                description: CreateCRDError represents a single error caught during parsing, compiling, etc.
 +                properties:
 +                  code:
 +                    type: string
@@ -408,8 +382,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 +                type: object
 +              type: array
 +            id:
-+              description: 'Important: Run "make" to regenerate code after modifying
-+                this file'
++              description: 'Important: Run "make" to regenerate code after modifying this file'
 +              type: string
 +            observedGeneration:
 +              format: int64
@@ -419,10 +392,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crd
 +                type: string
 +              type: array
 +            templateUID:
-+              description: UID is a type that holds unique ID values, including UUIDs.  Because
-+                we don't ONLY use UUIDs, this is an alias to string.  Being a type
-+                captures intent and helps make sure that UIDs and names do not get
-+                conflated.
++              description: UID is a type that holds unique ID values, including UUIDs.  Because we don't ONLY use UUIDs, this is an alias to string.  Being a type captures intent and helps make sure that UIDs and names do not get conflated.
 +              type: string
 +          type: object
 +      type: object
@@ -445,10 +415,10 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/ind
 -entries:
 -  gatekeeper:
 -  - apiVersion: v1
--    appVersion: v3.1.0-beta.11
--    created: "2020-07-24T16:56:23.670543818-07:00"
+-    appVersion: v3.1.0-rc.1
+-    created: "2020-08-14T12:56:49.1898705-07:00"
 -    description: A Helm chart for Gatekeeper
--    digest: 937aeddadbeac8fa1b71169c4fcde5229fa8445b0caec6339dc7cae2ac10d43f
+-    digest: 92d0b106768faa7d880fb772f7c6b2cba591ab348897db4317543241b32c7fb7
 -    home: https://github.com/open-policy-agent/gatekeeper
 -    keywords:
 -    - open policy agent
@@ -456,9 +426,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/ind
 -    sources:
 -    - https://github.com/open-policy-agent/gatekeeper.git
 -    urls:
--    - https://raw.githubusercontent.com/open-policy-agent/gatekeeper/v3.1.0-beta.11/charts/gatekeeper/gatekeeper-v3.1.0-beta.11.tgz
--    version: v3.1.0-beta.11
--generated: "2020-07-24T16:56:23.669766565-07:00"
+-    - https://raw.githubusercontent.com/open-policy-agent/gatekeeper/v3.1.0-rc.1/charts/gatekeeper/gatekeeper-v3.1.0-rc.1.tgz
+-    version: v3.1.0-rc.1
+-generated: "2020-08-14T12:56:49.1890596-07:00"
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/templates/_helpers.tpl packages/rancher-gatekeeper/charts/templates/_helpers.tpl
 --- packages/rancher-gatekeeper/charts-original/templates/_helpers.tpl
 +++ packages/rancher-gatekeeper/charts/templates/_helpers.tpl
@@ -474,10 +444,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 +{{- "" -}}
 +{{- end -}}
 +{{- end -}}
+\ No newline at end of file
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/templates/config-customresourcedefinition.yaml packages/rancher-gatekeeper/charts/templates/config-customresourcedefinition.yaml
 --- packages/rancher-gatekeeper/charts-original/templates/config-customresourcedefinition.yaml
 +++ packages/rancher-gatekeeper/charts/templates/config-customresourcedefinition.yaml
-@@ -1,119 +0,0 @@
+@@ -1,112 +0,0 @@
 -apiVersion: apiextensions.k8s.io/v1beta1
 -kind: CustomResourceDefinition
 -metadata:
@@ -508,14 +479,10 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 -      description: Config is the Schema for the configs API
 -      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'
+-          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'
+-          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
@@ -546,8 +513,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 -              description: Configuration for syncing k8s objects
 -              properties:
 -                syncOnly:
--                  description: If non-empty, only entries on this list will be replicated
--                    into OPA
+-                  description: If non-empty, only entries on this list will be replicated into OPA
 -                  items:
 -                    properties:
 -                      group:
@@ -563,13 +529,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 -              description: Configuration for validation
 -              properties:
 -                traces:
--                  description: List of requests to trace. Both "user" and "kinds"
--                    must be specified
+-                  description: List of requests to trace. Both "user" and "kinds" must be specified
 -                  items:
 -                    properties:
 -                      dump:
--                        description: Also dump the state of OPA with the trace. Set
--                          to `All` to dump everything.
+-                        description: Also dump the state of OPA with the trace. Set to `All` to dump everything.
 -                        type: string
 -                      kind:
 -                        description: Only trace requests of the following GroupVersionKind
@@ -600,7 +564,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/templates/constraintpodstatus-customresourcedefinition.yaml packages/rancher-gatekeeper/charts/templates/constraintpodstatus-customresourcedefinition.yaml
 --- packages/rancher-gatekeeper/charts-original/templates/constraintpodstatus-customresourcedefinition.yaml
 +++ packages/rancher-gatekeeper/charts/templates/constraintpodstatus-customresourcedefinition.yaml
-@@ -1,86 +0,0 @@
+@@ -1,78 +0,0 @@
 -apiVersion: apiextensions.k8s.io/v1beta1
 -kind: CustomResourceDefinition
 -metadata:
@@ -624,18 +588,13 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 -  scope: Namespaced
 -  validation:
 -    openAPIV3Schema:
--      description: ConstraintPodStatus is the Schema for the constraintpodstatuses
--        API
+-      description: ConstraintPodStatus is the Schema for the constraintpodstatuses API
 -      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'
+-          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'
+-          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
@@ -643,16 +602,13 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 -          description: ConstraintPodStatusStatus defines the observed state of ConstraintPodStatus
 -          properties:
 -            constraintUID:
--              description: Storing the constraint UID allows us to detect drift, such
--                as when a constraint has been recreated after its CRD was deleted
--                out from under it, interrupting the watch
+-              description: Storing the constraint UID allows us to detect drift, such as when a constraint has been recreated after its CRD was deleted out from under it, interrupting the watch
 -              type: string
 -            enforced:
 -              type: boolean
 -            errors:
 -              items:
--                description: Error represents a single error caught while adding a
--                  constraint to OPA
+-                description: Error represents a single error caught while adding a constraint to OPA
 -                properties:
 -                  code:
 -                    type: string
@@ -690,7 +646,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/templates/constrainttemplate-customresourcedefinition.yaml packages/rancher-gatekeeper/charts/templates/constrainttemplate-customresourcedefinition.yaml
 --- packages/rancher-gatekeeper/charts-original/templates/constrainttemplate-customresourcedefinition.yaml
 +++ packages/rancher-gatekeeper/charts/templates/constrainttemplate-customresourcedefinition.yaml
-@@ -1,111 +0,0 @@
+@@ -1,107 +0,0 @@
 -apiVersion: apiextensions.k8s.io/v1beta1
 -kind: CustomResourceDefinition
 -metadata:
@@ -720,14 +676,10 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 -    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'
+-          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'
+-          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
@@ -805,7 +757,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/templates/constrainttemplatepodstatus-customresourcedefinition.yaml packages/rancher-gatekeeper/charts/templates/constrainttemplatepodstatus-customresourcedefinition.yaml
 --- packages/rancher-gatekeeper/charts-original/templates/constrainttemplatepodstatus-customresourcedefinition.yaml
 +++ packages/rancher-gatekeeper/charts/templates/constrainttemplatepodstatus-customresourcedefinition.yaml
-@@ -1,88 +0,0 @@
+@@ -1,77 +0,0 @@
 -apiVersion: apiextensions.k8s.io/v1beta1
 -kind: CustomResourceDefinition
 -metadata:
@@ -829,29 +781,22 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 -  scope: Namespaced
 -  validation:
 -    openAPIV3Schema:
--      description: ConstraintTemplatePodStatus is the Schema for the constrainttemplatepodstatuses
--        API
+-      description: ConstraintTemplatePodStatus is the Schema for the constrainttemplatepodstatuses API
 -      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'
+-          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'
+-          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
 -        status:
--          description: ConstraintTemplatePodStatusStatus defines the observed state
--            of ConstraintTemplatePodStatus
+-          description: ConstraintTemplatePodStatusStatus defines the observed state of ConstraintTemplatePodStatus
 -          properties:
 -            errors:
 -              items:
--                description: CreateCRDError represents a single error caught during
--                  parsing, compiling, etc.
+-                description: CreateCRDError represents a single error caught during parsing, compiling, etc.
 -                properties:
 -                  code:
 -                    type: string
@@ -865,8 +810,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 -                type: object
 -              type: array
 -            id:
--              description: 'Important: Run "make" to regenerate code after modifying
--                this file'
+-              description: 'Important: Run "make" to regenerate code after modifying this file'
 -              type: string
 -            observedGeneration:
 -              format: int64
@@ -876,10 +820,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
 -                type: string
 -              type: array
 -            templateUID:
--              description: UID is a type that holds unique ID values, including UUIDs.  Because
--                we don't ONLY use UUIDs, this is an alias to string.  Being a type
--                captures intent and helps make sure that UIDs and names do not get
--                conflated.
+-              description: UID is a type that holds unique ID values, including UUIDs.  Because we don't ONLY use UUIDs, this is an alias to string.  Being a type captures intent and helps make sure that UIDs and names do not get conflated.
 -              type: string
 -          type: object
 -      type: object
@@ -1012,7 +953,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
        path: /v1/admit
    failurePolicy: Ignore
    name: validation.gatekeeper.sh
-@@ -41,7 +41,7 @@
+@@ -39,7 +39,7 @@
      caBundle: Cg==
      service:
        name: gatekeeper-webhook-service
@@ -1057,9 +998,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/val
  emitAuditEvents: false
  image:
 -  repository: openpolicyagent/gatekeeper
--  release: v3.1.0-beta.11
+-  release: v3.1.0-rc.1
 +  repository: rancher/opa-gatekeeper
-+  tag: v3.1.0-beta.11
++  tag: v3.1.0-rc.1
    pullPolicy: IfNotPresent
  nodeSelector: { kubernetes.io/os: linux }
  affinity: {}