(dev-v2.6-archive) added image overrides (#554)

(partially cherry picked from commit b3e81b1db6)
2020-08-17 16:53:55 -07:00 · 2020-08-17 16:53:55 -07:00 · f5880772d6
parent f6e48e44ae
commit f5880772d6
8 changed files with 234 additions and 65 deletions
--- a/packages/rancher-gatekeeper/package.yaml
+++ b/packages/rancher-gatekeeper/package.yaml
@ -1,7 +1,7 @@
 url: https://github.com/open-policy-agent/gatekeeper.git
 subdirectory: charts/gatekeeper
 type: git
-commit: 58ae7eacd2f93831b55557d0cd56ffdc3e04ab9a
+commit: 9a8051ac8fa3dc407056ed0293a0d97210386115
 generateCRDChart:
  enabled: true
  providesGVR: configs.config.gatekeeper.sh/v1alpha1
--- a/packages/rancher-gatekeeper/rancher-gatekeeper.patch
+++ b/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-rc.1
+ version: v3.1.0-beta.11
@@ -8,3 +8,9 @@
 sources:
   - https://github.com/open-policy-agent/gatekeeper.git
- appVersion: v3.1.0-rc.1
+ appVersion: v3.1.0-beta.11
 +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,111 @@
+@@ -0,0 +1,118 @@
 +apiVersion: apiextensions.k8s.io/v1beta1
 +kind: CustomResourceDefinition
 +metadata:
@ -52,10 +52,14 @@ 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
@ -86,7 +90,8 @@ 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:
@ -102,11 +107,13 @@ 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
@ -137,7 +144,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,78 @@
+@@ -0,0 +1,86 @@
 +apiVersion: apiextensions.k8s.io/v1beta1
 +kind: CustomResourceDefinition
 +metadata:
@ -161,13 +168,18 @@ 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
@ -175,13 +187,16 @@ 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
@ -219,7 +234,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,106 @@
+@@ -0,0 +1,110 @@
 +apiVersion: apiextensions.k8s.io/v1beta1
 +kind: CustomResourceDefinition
 +metadata:
@ -248,10 +263,14 @@ 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
@ -329,7 +348,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,77 @@
+@@ -0,0 +1,88 @@
 +apiVersion: apiextensions.k8s.io/v1beta1
 +kind: CustomResourceDefinition
 +metadata:
@ -353,22 +372,29 @@ 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
@ -382,7 +408,8 @@ 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
@ -392,7 +419,10 @@ 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
@ -415,10 +445,10 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/ind
 -entries:
 -  gatekeeper:
 -  - apiVersion: v1
-    appVersion: v3.1.0-rc.1
-    created: "2020-08-14T12:56:49.1898705-07:00"
+-    appVersion: v3.1.0-beta.11
+-    created: "2020-07-24T16:56:23.670543818-07:00"
 -    description: A Helm chart for Gatekeeper
-    digest: 92d0b106768faa7d880fb772f7c6b2cba591ab348897db4317543241b32c7fb7
+-    digest: 937aeddadbeac8fa1b71169c4fcde5229fa8445b0caec6339dc7cae2ac10d43f
 -    home: https://github.com/open-policy-agent/gatekeeper
 -    keywords:
 -    - open policy agent
@ -426,9 +456,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-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"
+-    - 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"
 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
@ -444,11 +474,10 @@ 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,112 +0,0 @@
+@@ -1,119 +0,0 @@
 -apiVersion: apiextensions.k8s.io/v1beta1
 -kind: CustomResourceDefinition
 -metadata:
@ -479,10 +508,14 @@ 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
@ -513,7 +546,8 @@ 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:
@ -529,11 +563,13 @@ 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
@ -564,7 +600,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,78 +0,0 @@
+@@ -1,86 +0,0 @@
 -apiVersion: apiextensions.k8s.io/v1beta1
 -kind: CustomResourceDefinition
 -metadata:
@ -588,13 +624,18 @@ 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
@ -602,13 +643,16 @@ 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
@ -646,7 +690,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,107 +0,0 @@
+@@ -1,111 +0,0 @@
 -apiVersion: apiextensions.k8s.io/v1beta1
 -kind: CustomResourceDefinition
 -metadata:
@ -676,10 +720,14 @@ 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
@ -757,7 +805,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,77 +0,0 @@
+@@ -1,88 +0,0 @@
 -apiVersion: apiextensions.k8s.io/v1beta1
 -kind: CustomResourceDefinition
 -metadata:
@ -781,22 +829,29 @@ 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
@ -810,7 +865,8 @@ 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
@ -820,7 +876,10 @@ 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
@ -953,7 +1012,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/tem
       path: /v1/admit
   failurePolicy: Ignore
   name: validation.gatekeeper.sh
-@@ -39,7 +39,7 @@
+@@ -41,7 +41,7 @@
     caBundle: Cg==
     service:
       name: gatekeeper-webhook-service
@ -998,9 +1057,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/val
 emitAuditEvents: false
 image:
 -  repository: openpolicyagent/gatekeeper
-  release: v3.1.0-rc.1
+-  release: v3.1.0-beta.11
 +  repository: rancher/opa-gatekeeper
-+  tag: v3.1.0-rc.1
+  tag: v3.1.0-beta.11
   pullPolicy: IfNotPresent
 nodeSelector: { kubernetes.io/os: linux }
 affinity: {}
--- a/packages/rancher-istio/charts/values.yaml
+++ b/packages/rancher-istio/charts/values.yaml
@ -67,8 +67,8 @@ kiali:
    ingress_enabled: false
  external_services:
    prometheus:
-      custom_metrics_url: "http://monitoring-rancher-monitor-prometheus.monitoring-system.svc:9090"
-      url: "http://monitoring-rancher-monitor-prometheus.monitoring-system.svc:9090"
+      custom_metrics_url: "http://rancher-monitoring-prometheus.monitoring-system.svc:9090"
+      url: "http://rancher-monitoring-prometheus.monitoring-system.svc:9090"
    tracing:
      enabled: false
  # TODO : update images
--- a/packages/rancher-kiali-server/rancher-kiali-server.patch
+++ b/packages/rancher-kiali-server/rancher-kiali-server.patch
@ -37,3 +37,62 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/C
 +  catalog.cattle.io/requires-gvr: prometheuses.monitoring.coreos.com/v1
 +  catalog.rancher.io/namespace: cattle-istio-system
 +  catalog.rancher.io/release-name: rancher-kiali-server
+diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/templates/deployment.yaml packages/rancher-kiali-server/charts/templates/deployment.yaml
+--- packages/rancher-kiali-server/charts-original/templates/deployment.yaml
+++ packages/rancher-kiali-server/charts/templates/deployment.yaml
+@@ -89,6 +89,11 @@
+             fieldRef:
+               fieldPath: metadata.namespace
+         volumeMounts:
+        {{- if .Values.web_root_override }}
+        - name: kiali-console
+          subPath: env.js
+          mountPath: /opt/kiali/console/env.js
+        {{- end }}
+         - name: {{ include "kiali-server.fullname" . }}-configuration
+           mountPath: "/kiali-configuration"
+         - name: {{ include "kiali-server.fullname" . }}-cert
+@@ -104,6 +109,14 @@
+         {{- toYaml .Values.deployment.resources | nindent 10 }}
+         {{- end }}
+       volumes:
+      {{- if .Values.web_root_override }}
+      - name: kiali-console
+        configMap:
+          name: kiali-console
+          items:
+          - key: env.js
+            path: env.js
+      {{- end }}
+       - name: {{ include "kiali-server.fullname" . }}-configuration
+         configMap:
+           name: {{ include "kiali-server.fullname" . }}
+diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/templates/web-root-configmap.yaml packages/rancher-kiali-server/charts/templates/web-root-configmap.yaml
+--- packages/rancher-kiali-server/charts-original/templates/web-root-configmap.yaml
+++ packages/rancher-kiali-server/charts/templates/web-root-configmap.yaml
+@@ -0,0 +1,12 @@
+{{- if .Values.web_root_override }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kiali-console
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kiali-server.labels" . | nindent 4 }}
+data:
+  env.js: |
+    window.WEB_ROOT='/api/v1/namespaces/{{ .Release.Namespace }}/services/http:rancher-istio-kiali:20001/proxy';
+{{- end }}
+diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-kiali-server/charts-original/values.yaml packages/rancher-kiali-server/charts/values.yaml
+--- packages/rancher-kiali-server/charts-original/values.yaml
+++ packages/rancher-kiali-server/charts/values.yaml
+@@ -9,6 +9,9 @@
+ # do this, a PR would be welcome.
+ kiali_route_url: ""
+ 
+# rancher specific override that allows proxy access to kiali url
+web_root_override: true
+
+ #
+ # Settings that mimic the Kiali CR which are placed in the ConfigMap
+ #
--- a/packages/rancher-logging/overlay/templates/logging-rke1.yaml
+++ b/packages/rancher-logging/overlay/templates/logging-rke1.yaml
@ -8,6 +8,9 @@ metadata:
 spec:
  controlNamespace: {{ .Release.Namespace }}
  fluentbit:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
+      tag: {{ .Values.images.fluentbit.tag }}
    inputTail:
      Tag: "rke"
      Path: "/rke/*.log"
@ -16,5 +19,11 @@ spec:
        destination: "/rke"
        readOnly: true
  fluentd:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
+      tag: {{ .Values.images.fluentd.tag }}
+    configReloaderImage:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.config_reloader.repository }}
+      tag: {{ .Values.images.config_reloader.tag }}
    disablePvc: {{ .Values.disablePvc }}
 {{- end }}
--- a/packages/rancher-logging/overlay/templates/logging.yaml
+++ b/packages/rancher-logging/overlay/templates/logging.yaml
@ -7,6 +7,15 @@ metadata:
 {{ include "logging-operator.labels" . | indent 4 }}
 spec:
  controlNamespace: {{ .Release.Namespace }}
-  fluentbit: {}
+  fluentbit:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
+      tag: {{ .Values.images.fluentbit.tag }}
  fluentd:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
+      tag: {{ .Values.images.fluentd.tag }}
+    configReloaderImage:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.config_reloader.repository }}
+      tag: {{ .Values.images.config_reloader.tag }}
    disablePvc: {{ .Values.disablePvc }}
--- a/packages/rancher-logging/overlay/templates/outputs/syslog/deployment.yaml
+++ b/packages/rancher-logging/overlay/templates/outputs/syslog/deployment.yaml
@ -17,7 +17,7 @@ spec:
    spec:
      containers:
      - name: fluentbit
-        image: paynejacob/fluent-bit-out-syslog:latest
+        image: "{{ template "system_default_registry" . }}{{ .Values.images.syslog_forwarder.repository }}:{{ .Values.images.syslog_forwarder.tag }}"
        ports:
          - containerPort: 24224
        volumeMounts:
--- a/packages/rancher-logging/rancher-logging.patch
+++ b/packages/rancher-logging/rancher-logging.patch
@ -19,6 +19,21 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/Chart.
 +  catalog.cattle.io/requires-gvr: logging.banzaicloud.io/v1beta1
 +  catalog.cattle.io/auto-install-gvr: logging.banzaicloud.io/v1beta1
 +  catalog.cattle.io/provides-gvr: logging.banzaicloud.io/v1beta1
+diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/templates/_helpers.tpl packages/rancher-logging/charts/templates/_helpers.tpl
+--- packages/rancher-logging/charts-original/templates/_helpers.tpl
+++ packages/rancher-logging/charts/templates/_helpers.tpl
+@@ -56,3 +56,11 @@
+ {{- end }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
+ {{- end -}}
+
+{{- define "system_default_registry" -}}
+{{- if .Values.global.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values.yaml packages/rancher-logging/charts/values.yaml
 --- packages/rancher-logging/charts-original/values.yaml
 +++ packages/rancher-logging/charts/values.yaml
@ -31,7 +46,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
-@@ -76,4 +76,70 @@
+@@ -76,4 +76,93 @@
 monitoring:
   # Create a Prometheus Operator ServiceMonitor object
   serviceMonitor:
@ -105,8 +120,26 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values
 +  cluster: true
 +  root_ca: ""
 +
+disablePvc: true
+
 +additionalLoggingSources:
 +  rke1:
 +    enabled: false
 +
-+disablePvc: true
+images:
+  config_reloader:
+    repository: rancher/jimmidyson-configmap-reload
+    tag: v0.2.2
+  fluentbit:
+    repository: rancher/fluent-fluent-bit
+    tag: 1.5.0
+  fluentd:
+    repository: rancher/banzaicloud-fluentd
+    tag: v1.10.4-alpine-2
+  syslog_forwarder:
+    repository: rancher/fluent-bit-out-syslog
+    tag: 0.1.0
+
+global:
+  systemDefaultRegistry: ""
+\ No newline at end of file