Merge pull request #1221 from dgem/1209_move_crds

#1209 Relocate CRDs in helm chart
flux-iac · Mar 1, 2024 · 06d53ac · 06d53ac
2 parents 467c1c5 + 5d9f094
commit 06d53ac
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/charts/tf-controller/README.md b/charts/tf-controller/README.md
@@ -49,10 +49,9 @@ __Note__: If you need to use the `imagePullSecrets` it would be best to set `ser
 | extraEnv | object | `{}` | Additional container environment variables. |
 | fullnameOverride | string | `""` | Provide a fullname |
 | image.pullPolicy | string | `"IfNotPresent"` | Controller image pull policy |
-| image.repository | string | `"ghcr.io/flux-iac/tf-controller"` | Controller image repository |
+| image.repository | string | `"ghcr.io/flux-iac/tofu-controller"` | Controller image repository |
 | image.tag | string | `.Chart.AppVersion` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` | Controller image pull secret |
-| installCRDs | bool | `true` | If `true`, install CRDs as part of the helm installation |
 | kubeAPIBurst | int | `100` | Argument for `--kube-api-burst` (Controller).  Burst indicates the maximum burst queries-per-second of requests sent to the Kubernetes API, defaults to 100. |
 | kubeAPIQPS | int | `50` | Argument for `--kube-api-qps` (Controller).  Kube API QPS indicates the maximum queries-per-second of requests sent to the Kubernetes API, defaults to 50. |
 | logEncoding | string | `"json"` | Argument for `--log-encoding`. Can be 'json' or 'console'. (Controller) |

diff --git a/charts/tf-controller/templates/crds.yaml → charts/tf-controller/crds/crds.yaml b/charts/tf-controller/templates/crds.yaml → charts/tf-controller/crds/crds.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.installCRDs }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -7,7 +6,8 @@ metadata:
   creationTimestamp: null
   name: terraforms.infra.contrib.fluxcd.io
   labels:
-    {{- include "tf-controller.labels" . | nindent 4 }}
+    helm.sh/chart: tf-controller-0.16.0-rc.3
+    app.kubernetes.io/version: 0.16.0-rc.3
 spec:
   group: infra.contrib.fluxcd.io
   names:
@@ -238,7 +238,7 @@ spec:
                     address:
                       description: Address to perform tcp health check on. Required
                         when tcp type is specified. Go template can be used to reference
-                        values from the terraform output (e.g. 127.0.0.1:8080, {{.address}}:{{.port}}).
+                        values from the terraform output (e.g. 127.0.0.1:8080).
                       type: string
                     name:
                       description: Name of the health check.
@@ -262,8 +262,7 @@ spec:
                     url:
                       description: URL to perform http health check on. Required when
                         http type is specified. Go template can be used to reference
-                        values from the terraform output (e.g. https://example.org,
-                        {{.output_url}}).
+                        values from the terraform output (e.g. https://example.org).
                       type: string
                   required:
                   - name
@@ -5203,7 +5202,7 @@ spec:
                     address:
                       description: Address to perform tcp health check on. Required
                         when tcp type is specified. Go template can be used to reference
-                        values from the terraform output (e.g. 127.0.0.1:8080, {{.address}}:{{.port}}).
+                        values from the terraform output (e.g. 127.0.0.1:8080).
                       type: string
                     name:
                       description: Name of the health check.
@@ -5227,8 +5226,7 @@ spec:
                     url:
                       description: URL to perform http health check on. Required when
                         http type is specified. Go template can be used to reference
-                        values from the terraform output (e.g. https://example.org,
-                        {{.output_url}}).
+                        values from the terraform output (e.g. https://example.org).
                       type: string
                   required:
                   - name
@@ -10221,4 +10219,3 @@ spec:
     storage: true
     subresources:
       status: {}
-{{- end }}
diff --git a/charts/tf-controller/templates/deployment.yaml b/charts/tf-controller/templates/deployment.yaml
@@ -49,7 +49,7 @@ spec:
         command:
         - /sbin/tini
         - --
-        - tf-controller
+        - tofu-controller
         env:
           {{- include "pod-namespace" . | indent 8 }}
         - name: RUNNER_POD_IMAGE

diff --git a/charts/tf-controller/values.yaml b/charts/tf-controller/values.yaml
@@ -1,5 +1,3 @@
-# -- If `true`, install CRDs as part of the helm installation
-installCRDs: true
 # -- If `true`, enable cross-namespace references for controller and branch-planner
 allowCrossNamespaceRefs: false
 # ServiceAccount
@@ -24,7 +22,7 @@ podLabels: {}
 replicaCount: 1
 image:
   # -- Controller image repository
-  repository: ghcr.io/flux-iac/tf-controller
+  repository: ghcr.io/flux-iac/tofu-controller
   # -- Controller image pull policy
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.