chore: minor fixes (#109)

* chore: change renovate groups

Signed-off-by: Oliver Bähler <[email protected]>

* chore: update ignore

Signed-off-by: Oliver Bähler <[email protected]>

* fix(helm): remove duplicated label

Signed-off-by: Oliver Bähler <[email protected]>

---------

Signed-off-by: Oliver Bähler <[email protected]>

Author: oliverbaehler

.gitignore

@@ -31,3 +31,4 @@ dist
 
 .hugo_build.lock
 public/
+*.tgz

charts/capsule-argo-addon/README.md

@@ -31,7 +31,7 @@ The following Values are available for this chart.
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | global.jobs.kubectl.affinity | object | `{}` | Set affinity rules |
-| global.jobs.kubectl.annotations | object | `{"helm.sh/hook-delete-policy":"before-hook-creation,hook-succeeded"}` | Annotations to add to the certgen job. |
+| global.jobs.kubectl.annotations | object | `{}` | Annotations to add to the certgen job. |
 | global.jobs.kubectl.image.pullPolicy | string | `"IfNotPresent"` | Set the image pull policy of the helm chart job |
 | global.jobs.kubectl.image.registry | string | `"docker.io"` | Set the image repository of the helm chart job |
 | global.jobs.kubectl.image.repository | string | `"clastix/kubectl"` | Set the image repository of the helm chart job |

charts/capsule-argo-addon/crds/addons.projectcapsule.dev_argoaddons.yaml

@@ -40,7 +40,7 @@ spec:
             description: ArgoAddonSpec defines the desired state of ArgoAddon
             properties:
               argo:
-                description: ArgoCD configuration
+                description: Argo configuration
                 properties:
                   destination:
                     default: https://kubernetes.default.svc
@@ -72,15 +72,20 @@ spec:
                 required:
                 - serviceAccountNamespace
                 type: object
+              decouple:
+                default: true
+                description: |-
+                  When decouple is enabled, appprojects are preserved even in the case when the origin tenant is deleted.
+                  This can also be set on a per-tenant basis via annotations.
+                type: boolean
               force:
                 default: false
                 description: |-
-                  When force is enabled, approjects which already exist with the same name as a tenant will be adopted
-                  and overwritten. When disabled the approjects will not be changed or adopted.
-                  This is true for any other resource as well
+                  When force is enabled, appprojects which already exist with the same name as a tenant will be adopted
+                  and overwritten. When disabled the appprojects will not be changed or adopted.
+                  This is true for any other resource as well. This can also be set on a per-tenant basis via annotations.
                 type: boolean
               proxy:
-                default: {}
                 description: Capsule-Proxy configuration for the controller
                 properties:
                   enabled:
@@ -108,9 +113,19 @@ spec:
                     description: Port of the capsule-proxy service
                     type: boolean
                 type: object
+              readonly:
+                default: false
+                description: |-
+                  All appprojects, which are collected by this controller, are set into ready-only mode
+                  That means only properties from matching translators are respected. Any changes from users are
+                  overwritten. This can also be set on a per-tenant basis via annotations.
+                type: boolean
             required:
             - argo
+            - decouple
             - force
+            - proxy
+            - readonly
             type: object
           status:
             description: ArgoAddonStatus defines the observed state of ArgoAddon
@@ -119,7 +134,7 @@ spec:
                 description: Last applied valid configuration
                 properties:
                   argo:
-                    description: ArgoCD configuration
+                    description: Argo configuration
                     properties:
                       destination:
                         default: https://kubernetes.default.svc
@@ -151,15 +166,20 @@ spec:
                     required:
                     - serviceAccountNamespace
                     type: object
+                  decouple:
+                    default: true
+                    description: |-
+                      When decouple is enabled, appprojects are preserved even in the case when the origin tenant is deleted.
+                      This can also be set on a per-tenant basis via annotations.
+                    type: boolean
                   force:
                     default: false
                     description: |-
-                      When force is enabled, approjects which already exist with the same name as a tenant will be adopted
-                      and overwritten. When disabled the approjects will not be changed or adopted.
-                      This is true for any other resource as well
+                      When force is enabled, appprojects which already exist with the same name as a tenant will be adopted
+                      and overwritten. When disabled the appprojects will not be changed or adopted.
+                      This is true for any other resource as well. This can also be set on a per-tenant basis via annotations.
                     type: boolean
                   proxy:
-                    default: {}
                     description: Capsule-Proxy configuration for the controller
                     properties:
                       enabled:
@@ -188,9 +208,19 @@ spec:
                         description: Port of the capsule-proxy service
                         type: boolean
                     type: object
+                  readonly:
+                    default: false
+                    description: |-
+                      All appprojects, which are collected by this controller, are set into ready-only mode
+                      That means only properties from matching translators are respected. Any changes from users are
+                      overwritten. This can also be set on a per-tenant basis via annotations.
+                    type: boolean
                 required:
                 - argo
+                - decouple
                 - force
+                - proxy
+                - readonly
                 type: object
             type: object
         type: object

charts/capsule-argo-addon/templates/_helpers.tpl

@@ -40,7 +40,6 @@ helm.sh/chart: {{ include "helm.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-app.kubernetes.io/name: {{ include "helm.chart" . }}
 {{- end }}
 
 {{/*

charts/capsule-argo-addon/values.yaml

@@ -18,8 +18,7 @@ global:
         # -- Set the image tag of the helm chart job
         tag: ""
       # -- Annotations to add to the certgen job.
-      annotations:
-        "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+      annotations: {}
       # -- Set the restartPolicy
       restartPolicy: Never
       # -- Sets the ttl in seconds after a finished certgen job is deleted. Set to -1 to never delete.

renovate.json

@@ -16,11 +16,6 @@
       "matchManagers": ["github-actions", "flux"],
       "groupName": "all-ci-dependencies",
       "updateTypes": ["major", "minor", "patch"]
-    },
-    {
-      "matchManagers": ["gomod"],
-      "groupName": "go-minor-dependencies",
-      "updateTypes": ["minor", "patch"]
     }
   ]
 }