Multiple helm repos

charts/templates-controller/crds/capitemplate-crd.yaml

@@ -64,6 +64,49 @@ spec:
                         required:
                           description: If true the chart/profile will always be installed
                           type: boolean
+                        sourceRef:
+                          description: SourceRef is the name/namespace reference to
+                            the HelmRepository. No other source types are currently
+                            supported. The HelmRepository must be present on the rendering
+                            cluster. The full referenced HelmRepository resource will
+                            be included in the template output.
+                          properties:
+                            apiVersion:
+                              description: API version of the referent.
+                              type: string
+                            fieldPath:
+                              description: 'If referring to a piece of an object instead
+                                of an entire object, this string should contain a
+                                valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                                For example, if the object reference is to a container
+                                within a pod, this would take on a value like: "spec.containers{name}"
+                                (where "name" refers to the name of the container
+                                that triggered the event) or if no container name
+                                is specified "spec.containers[2]" (container with
+                                index 2 in this pod). This syntax is chosen only to
+                                have some well-defined way of referencing a part of
+                                an object. TODO: this design is not final and this
+                                field is subject to change in the future.'
+                              type: string
+                            kind:
+                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                            namespace:
+                              description: 'Namespace of the referent. More info:
+                                https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                              type: string
+                            resourceVersion:
+                              description: 'Specific resourceVersion to which this
+                                reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                              type: string
+                            uid:
+                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
                         targetNamespace:
                           description: Shortcut to template.content.spec.targetNamespace
                           type: string
@@ -193,6 +236,49 @@ spec:
                         required:
                           description: If true the chart/profile will always be installed
                           type: boolean
+                        sourceRef:
+                          description: SourceRef is the name/namespace reference to
+                            the HelmRepository. No other source types are currently
+                            supported. The HelmRepository must be present on the rendering
+                            cluster. The full referenced HelmRepository resource will
+                            be included in the template output.
+                          properties:
+                            apiVersion:
+                              description: API version of the referent.
+                              type: string
+                            fieldPath:
+                              description: 'If referring to a piece of an object instead
+                                of an entire object, this string should contain a
+                                valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                                For example, if the object reference is to a container
+                                within a pod, this would take on a value like: "spec.containers{name}"
+                                (where "name" refers to the name of the container
+                                that triggered the event) or if no container name
+                                is specified "spec.containers[2]" (container with
+                                index 2 in this pod). This syntax is chosen only to
+                                have some well-defined way of referencing a part of
+                                an object. TODO: this design is not final and this
+                                field is subject to change in the future.'
+                              type: string
+                            kind:
+                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                            namespace:
+                              description: 'Namespace of the referent. More info:
+                                https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                              type: string
+                            resourceVersion:
+                              description: 'Specific resourceVersion to which this
+                                reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                              type: string
+                            uid:
+                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
                         targetNamespace:
                           description: Shortcut to template.content.spec.targetNamespace
                           type: string

charts/templates-controller/crds/gitopstemplate-crd.yaml

@@ -64,6 +64,49 @@ spec:
                         required:
                           description: If true the chart/profile will always be installed
                           type: boolean
+                        sourceRef:
+                          description: SourceRef is the name/namespace reference to
+                            the HelmRepository. No other source types are currently
+                            supported. The HelmRepository must be present on the rendering
+                            cluster. The full referenced HelmRepository resource will
+                            be included in the template output.
+                          properties:
+                            apiVersion:
+                              description: API version of the referent.
+                              type: string
+                            fieldPath:
+                              description: 'If referring to a piece of an object instead
+                                of an entire object, this string should contain a
+                                valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                                For example, if the object reference is to a container
+                                within a pod, this would take on a value like: "spec.containers{name}"
+                                (where "name" refers to the name of the container
+                                that triggered the event) or if no container name
+                                is specified "spec.containers[2]" (container with
+                                index 2 in this pod). This syntax is chosen only to
+                                have some well-defined way of referencing a part of
+                                an object. TODO: this design is not final and this
+                                field is subject to change in the future.'
+                              type: string
+                            kind:
+                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                            namespace:
+                              description: 'Namespace of the referent. More info:
+                                https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                              type: string
+                            resourceVersion:
+                              description: 'Specific resourceVersion to which this
+                                reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                              type: string
+                            uid:
+                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
                         targetNamespace:
                           description: Shortcut to template.content.spec.targetNamespace
                           type: string
@@ -195,6 +238,49 @@ spec:
                         required:
                           description: If true the chart/profile will always be installed
                           type: boolean
+                        sourceRef:
+                          description: SourceRef is the name/namespace reference to
+                            the HelmRepository. No other source types are currently
+                            supported. The HelmRepository must be present on the rendering
+                            cluster. The full referenced HelmRepository resource will
+                            be included in the template output.
+                          properties:
+                            apiVersion:
+                              description: API version of the referent.
+                              type: string
+                            fieldPath:
+                              description: 'If referring to a piece of an object instead
+                                of an entire object, this string should contain a
+                                valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                                For example, if the object reference is to a container
+                                within a pod, this would take on a value like: "spec.containers{name}"
+                                (where "name" refers to the name of the container
+                                that triggered the event) or if no container name
+                                is specified "spec.containers[2]" (container with
+                                index 2 in this pod). This syntax is chosen only to
+                                have some well-defined way of referencing a part of
+                                an object. TODO: this design is not final and this
+                                field is subject to change in the future.'
+                              type: string
+                            kind:
+                              description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                            namespace:
+                              description: 'Namespace of the referent. More info:
+                                https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                              type: string
+                            resourceVersion:
+                              description: 'Specific resourceVersion to which this
+                                reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                              type: string
+                            uid:
+                              description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
                         targetNamespace:
                           description: Shortcut to template.content.spec.targetNamespace
                           type: string

cmd/clusters-service/api/cluster_services.proto

@@ -658,6 +658,7 @@ message TemplateProfile {
   bool required = 6;
   string profile_template = 7;
   string layer = 8;
+  SourceRef source_ref = 9;
 }
 
 message TemplateObject {
@@ -830,12 +831,18 @@ message Profile {
   repeated string available_versions = 11;
 }
 
+message HelmRepositoryRef { 
+  string name = 1; 
+  string namespace = 2;
+}
+
 message ProfileValues {
   string name = 1;
   string version = 2;
   string values = 3;
   string layer = 4;
   string namespace = 5;
+  HelmRepositoryRef helm_repository  = 6; 
 }
 
 message GetConfigRequest {}
@@ -845,6 +852,7 @@ message GetConfigResponse {
   string management_cluster_name = 2;
   string ui_config = 3;
   map<string, string> git_host_types = 4;
+  HelmRepositoryRef default_helm_repository = 5;
 }
 
 message PolicyParamRepeatedString { repeated string values = 1; }
@@ -891,6 +899,8 @@ message RepositoryChart {
   // This is the available versions in reverse semver order.
   repeated string versions = 2;
   string layer = 3;
+  string repo_name = 4; 
+  string repo_namespace = 5;
 }
 
 message ListChartsForRepositoryResponse {