From 66484208e99cf42c19965df350e4ca2fc3af4e27 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Fri, 16 Dec 2022 13:48:40 +0100 Subject: [PATCH] feat(template-controller): Bump controller to v0.5.3 (#17) * feat(template-controller): Bump controller to v0.5.3 * docs(template-controller): Update Readme Signed-off-by: Alexander Block * docs(template-controller): Update Changelog Signed-off-by: Alexander Block * chore(template-controller): Bump chart to Signed-off-by: Alexander Block Signed-off-by: Alexander Block --- Taskfile.yml | 3 + charts/template-controller/CHANGELOG.md | 9 +- charts/template-controller/Chart.yaml | 4 +- charts/template-controller/README.md | 2 +- .../templates.kluctl.io_gitprojectors.yaml | 200 ++++++++++++++++++ ...ates.kluctl.io_listgithubpullrequests.yaml | 2 +- ...tes.kluctl.io_listgitlabmergerequests.yaml | 8 +- .../templates.kluctl.io_objecttemplates.yaml | 1 + .../templates/clusterrole.yaml | 95 +++++++++ 9 files changed, 315 insertions(+), 9 deletions(-) create mode 100644 charts/template-controller/crds/templates.kluctl.io_gitprojectors.yaml diff --git a/Taskfile.yml b/Taskfile.yml index 2a0cc5c..0a74395 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -34,6 +34,7 @@ tasks: download-crds-template-controller: cmds: - echo "Downloading CRDs for template-controller with version {{.SOURCE_VER}}" + - curl -s https://raw.githubusercontent.com/kluctl/template-controller/{{.SOURCE_VER}}/config/crd/bases/templates.kluctl.io_gitprojectors.yaml > charts/template-controller/crds/templates.kluctl.io_gitprojectors.yaml - curl -s https://raw.githubusercontent.com/kluctl/template-controller/{{.SOURCE_VER}}/config/crd/bases/templates.kluctl.io_listgithubpullrequests.yaml > charts/template-controller/crds/templates.kluctl.io_listgithubpullrequests.yaml - curl -s https://raw.githubusercontent.com/kluctl/template-controller/{{.SOURCE_VER}}/config/crd/bases/templates.kluctl.io_listgitlabmergerequests.yaml > charts/template-controller/crds/templates.kluctl.io_listgitlabmergerequests.yaml - curl -s https://raw.githubusercontent.com/kluctl/template-controller/{{.SOURCE_VER}}/config/crd/bases/templates.kluctl.io_objecthandlers.yaml > charts/template-controller/crds/templates.kluctl.io_objecthandlers.yaml @@ -65,6 +66,8 @@ tasks: cmds: - echo "Downloading RBAC for template-controller with version {{.SOURCE_VER}}" - printf "$(curl -s https://raw.githubusercontent.com/kluctl/template-controller/{{.SOURCE_VER}}/config/rbac/role.yaml)\n---\n" > charts/template-controller/templates/clusterrole.yaml + - printf "$(curl -s https://raw.githubusercontent.com/kluctl/template-controller/{{.SOURCE_VER}}/config/rbac/gitprojector_editor_role.yaml)\n---\n" >> charts/template-controller/templates/clusterrole.yaml + - printf "$(curl -s https://raw.githubusercontent.com/kluctl/template-controller/{{.SOURCE_VER}}/config/rbac/gitprojector_viewer_role.yaml)\n---\n" >> charts/template-controller/templates/clusterrole.yaml - printf "$(curl -s https://raw.githubusercontent.com/kluctl/template-controller/{{.SOURCE_VER}}/config/rbac/listgithubpullrequests_editor_role.yaml)\n---\n" >> charts/template-controller/templates/clusterrole.yaml - printf "$(curl -s https://raw.githubusercontent.com/kluctl/template-controller/{{.SOURCE_VER}}/config/rbac/listgithubpullrequests_viewer_role.yaml)\n---\n" >> charts/template-controller/templates/clusterrole.yaml - printf "$(curl -s https://raw.githubusercontent.com/kluctl/template-controller/{{.SOURCE_VER}}/config/rbac/listgitlabmergerequests_editor_role.yaml)\n---\n" >> charts/template-controller/templates/clusterrole.yaml diff --git a/charts/template-controller/CHANGELOG.md b/charts/template-controller/CHANGELOG.md index dc816d0..d80420b 100644 --- a/charts/template-controller/CHANGELOG.md +++ b/charts/template-controller/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog -## Unreleased (2022-11-29) +## [Unreleased](https://github.com/kluctl/charts/compare/template-controller-0.1.0...HEAD) (2022-12-16) + +### Features + +* **template-controller:** Bump controller to v0.5.3 + ([997e96a](https://github.com/kluctl/charts/commit/997e96afb430b40c67b70e893ffa5fc20274e093)) + +## template-controller-0.1.0 (2022-11-29) ### Features diff --git a/charts/template-controller/Chart.yaml b/charts/template-controller/Chart.yaml index 1abbbf4..664784a 100644 --- a/charts/template-controller/Chart.yaml +++ b/charts/template-controller/Chart.yaml @@ -9,5 +9,5 @@ maintainers: name: codablock description: A Helm chart for the template-controller type: application -version: 0.1.0 -appVersion: "v0.4.1" +version: 0.1.1 +appVersion: "v0.5.3" diff --git a/charts/template-controller/README.md b/charts/template-controller/README.md index a216409..b05a068 100644 --- a/charts/template-controller/README.md +++ b/charts/template-controller/README.md @@ -1,6 +1,6 @@ # template-controller -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.1](https://img.shields.io/badge/AppVersion-v0.4.1-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.5.3](https://img.shields.io/badge/AppVersion-v0.5.3-informational?style=flat-square) A Helm chart for the template-controller diff --git a/charts/template-controller/crds/templates.kluctl.io_gitprojectors.yaml b/charts/template-controller/crds/templates.kluctl.io_gitprojectors.yaml new file mode 100644 index 0000000..29629f4 --- /dev/null +++ b/charts/template-controller/crds/templates.kluctl.io_gitprojectors.yaml @@ -0,0 +1,200 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.9.2 + creationTimestamp: null + name: gitprojectors.templates.kluctl.io +spec: + group: templates.kluctl.io + names: + kind: GitProjector + listKind: GitProjectorList + plural: gitprojectors + singular: gitprojector + scope: Namespaced + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + description: GitProjector is the Schema for the gitprojectors 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' + 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' + type: string + metadata: + type: object + spec: + description: GitProjectorSpec defines the desired state of GitProjector + properties: + files: + items: + properties: + glob: + type: string + parseYaml: + default: false + type: boolean + required: + - glob + type: object + type: array + interval: + default: 5m + description: Interval is the interval at which to query the Gitlab + API. Defaults to 5m. + pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ + type: string + ref: + properties: + branch: + description: Branch to filter for. Can also be a regex. + type: string + commit: + description: Commit SHA to check out, takes precedence over all + reference fields. + type: string + tag: + description: Branch to filter for. Can also be a regex. + type: string + type: object + secretRef: + properties: + name: + description: Name of the referent. + type: string + required: + - name + type: object + suspend: + default: false + type: boolean + url: + type: string + required: + - url + type: object + status: + description: GitProjectorStatus defines the observed state of GitProjector + properties: + allRefsHash: + type: string + conditions: + items: + description: "Condition contains details for one aspect of the current + state of this API Resource. --- This struct is intended for direct + use as an array at the field path .status.conditions. For example, + \n type FooStatus struct{ // Represents the observations of a + foo's current state. // Known .status.conditions.type are: \"Available\", + \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge + // +listType=map // +listMapKey=type Conditions []metav1.Condition + `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" + protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }" + properties: + lastTransitionTime: + description: lastTransitionTime is the last time the condition + transitioned from one status to another. This should be when + the underlying condition changed. If that is not known, then + using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: message is a human readable message indicating + details about the transition. This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: observedGeneration represents the .metadata.generation + that the condition was set based upon. For instance, if .metadata.generation + is currently 12, but the .status.conditions[x].observedGeneration + is 9, the condition is out of date with respect to the current + state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: reason contains a programmatic identifier indicating + the reason for the condition's last transition. Producers + of specific condition types may define expected values and + meanings for this field, and whether the values are considered + a guaranteed API. The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + --- Many .condition.type values are consistent across resources + like Available, but because arbitrary conditions can be useful + (see .node.status.conditions), the ability to deconflict is + important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + result: + items: + properties: + files: + items: + properties: + parsed: + items: + type: object + type: array + x-kubernetes-preserve-unknown-fields: true + path: + type: string + raw: + type: string + required: + - path + type: object + type: array + ref: + properties: + branch: + description: Branch to filter for. Can also be a regex. + type: string + commit: + description: Commit SHA to check out, takes precedence over + all reference fields. + type: string + tag: + description: Branch to filter for. Can also be a regex. + type: string + type: object + required: + - files + - ref + type: object + type: array + type: object + type: object + served: true + storage: true + subresources: + status: {} diff --git a/charts/template-controller/crds/templates.kluctl.io_listgithubpullrequests.yaml b/charts/template-controller/crds/templates.kluctl.io_listgithubpullrequests.yaml index dbf93c1..c69aeb0 100644 --- a/charts/template-controller/crds/templates.kluctl.io_listgithubpullrequests.yaml +++ b/charts/template-controller/crds/templates.kluctl.io_listgithubpullrequests.yaml @@ -47,7 +47,7 @@ spec: pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ type: string labels: - description: Labels is used to filter the MRs that you want to target + description: Labels is used to filter the PRs that you want to target items: type: string type: array diff --git a/charts/template-controller/crds/templates.kluctl.io_listgitlabmergerequests.yaml b/charts/template-controller/crds/templates.kluctl.io_listgitlabmergerequests.yaml index c2d7b92..2f9e90c 100644 --- a/charts/template-controller/crds/templates.kluctl.io_listgitlabmergerequests.yaml +++ b/charts/template-controller/crds/templates.kluctl.io_listgitlabmergerequests.yaml @@ -53,8 +53,8 @@ spec: type: array limit: default: 100 - description: Limit limits the maximum number of pull requests to fetch. - Defaults to 100 + description: Limit limits the maximum number of merge requests to + fetch. Defaults to 100 type: integer project: description: GitLab project to scan. Required. @@ -63,8 +63,8 @@ spec: type: string state: default: all - description: 'PullRequestState is an additional MRs filter to get - only those with a certain state. Default: "all"' + description: 'State is an additional MRs filter to get only those + with a certain state. Default: "all"' enum: - all - opened diff --git a/charts/template-controller/crds/templates.kluctl.io_objecttemplates.yaml b/charts/template-controller/crds/templates.kluctl.io_objecttemplates.yaml index 5a59510..7d4d345 100644 --- a/charts/template-controller/crds/templates.kluctl.io_objecttemplates.yaml +++ b/charts/template-controller/crds/templates.kluctl.io_objecttemplates.yaml @@ -37,6 +37,7 @@ spec: properties: interval: default: 30s + pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ type: string matrix: items: diff --git a/charts/template-controller/templates/clusterrole.yaml b/charts/template-controller/templates/clusterrole.yaml index 8fe5c86..92f7ca6 100644 --- a/charts/template-controller/templates/clusterrole.yaml +++ b/charts/template-controller/templates/clusterrole.yaml @@ -21,6 +21,15 @@ rules: - get - list - watch +- apiGroups: + - "" + resources: + - serviceaccounts + verbs: + - get + - impersonate + - list + - watch - apiGroups: - apiextensions.k8s.io resources: @@ -29,6 +38,32 @@ rules: - get - list - watch +- apiGroups: + - templates.kluctl.io + resources: + - gitprojectors + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - templates.kluctl.io + resources: + - gitprojectors/finalizers + verbs: + - update +- apiGroups: + - templates.kluctl.io + resources: + - gitprojectors/status + verbs: + - get + - patch + - update - apiGroups: - templates.kluctl.io resources: @@ -134,6 +169,66 @@ rules: - patch - update --- +# permissions for end users to edit gitprojectors. +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/name: {{ include "template-controller.fullname" . }}-clusterrole + app.kubernetes.io/instance: gitprojector-editor-role + app.kubernetes.io/component: rbac + app.kubernetes.io/created-by: template-controller + app.kubernetes.io/part-of: template-controller + app.kubernetes.io/managed-by: kustomize + name: {{ include "template-controller.fullname" . }}-gitprojector-editor-role +rules: +- apiGroups: + - templates.kluctl.io + resources: + - gitprojectors + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - templates.kluctl.io + resources: + - gitprojectors/status + verbs: + - get +--- +# permissions for end users to view gitprojectors. +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/name: {{ include "template-controller.fullname" . }}-clusterrole + app.kubernetes.io/instance: gitprojector-viewer-role + app.kubernetes.io/component: rbac + app.kubernetes.io/created-by: template-controller + app.kubernetes.io/part-of: template-controller + app.kubernetes.io/managed-by: kustomize + name: {{ include "template-controller.fullname" . }}-gitprojector-viewer-role +rules: +- apiGroups: + - templates.kluctl.io + resources: + - gitprojectors + verbs: + - get + - list + - watch +- apiGroups: + - templates.kluctl.io + resources: + - gitprojectors/status + verbs: + - get +--- # permissions for end users to edit listgithubpullrequests. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole