Merge pull request #6 from fluxcd/crd-test

Test Flux v2.3 release candidate
fluxcd · May 8, 2024 · 20f3c5e · 20f3c5e
2 parents fd097ba + 6d59398
commit 20f3c5e
Show file tree

Hide file tree

Showing 18 changed files with 2,602 additions and 26 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -14,7 +14,8 @@ jobs:
   bench:
     strategy:
       matrix:
-        RESOURCES: [ 100, 500, 1000 ]
+        RESOURCES: [100, 500, 1000]
+        CRDS: [50, 250, 500]
     runs-on:
       group: "Default Larger Runners"
       labels: ubuntu-latest-16-cores
@@ -31,6 +32,8 @@ jobs:
         run: make timoni-push
       - name: Install Flux
         run: make flux-up
+        env:
+          CRD_COUNT: ${{ matrix.CRDS }}
       - name: Install metrics-server
         run: timoni bundle apply -f timoni/bundles/flux-metrics.cue
       - name: Run kustomize install benchmark

diff --git a/manifests/bases/helm-controller/kustomization.yaml b/manifests/bases/helm-controller/kustomization.yaml
@@ -1,9 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/helm-controller/releases/download/v0.37.0/helm-controller.crds.yaml
-#- https://github.com/fluxcd/helm-controller/config/crd?ref=main
-- https://github.com/fluxcd/helm-controller/releases/download/v0.37.0/helm-controller.deployment.yaml
+#- https://github.com/fluxcd/helm-controller/releases/download/v0.37.4/helm-controller.crds.yaml
+- https://raw.githubusercontent.com/fluxcd/helm-controller/main/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml
+- https://github.com/fluxcd/helm-controller/releases/download/v0.37.4/helm-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

diff --git a/manifests/bases/helm-controller/patch.yaml b/manifests/bases/helm-controller/patch.yaml
@@ -7,3 +7,19 @@
 - op: add
   path: /spec/template/spec/priorityClassName
   value: system-cluster-critical
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMAXPROCS
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.cpu
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMEMLIMIT
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.memory
diff --git a/manifests/bases/image-automation-controller/kustomization.yaml b/manifests/bases/image-automation-controller/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/image-automation-controller/releases/download/v0.37.0/image-automation-controller.crds.yaml
-- https://github.com/fluxcd/image-automation-controller/releases/download/v0.37.0/image-automation-controller.deployment.yaml
+- https://github.com/fluxcd/image-automation-controller/releases/download/v0.38.0/image-automation-controller.crds.yaml
+- https://github.com/fluxcd/image-automation-controller/releases/download/v0.38.0/image-automation-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

diff --git a/manifests/bases/image-automation-controller/patch.yaml b/manifests/bases/image-automation-controller/patch.yaml
@@ -4,3 +4,19 @@
 - op: add
   path: /spec/template/spec/serviceAccountName
   value: image-automation-controller
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMAXPROCS
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.cpu
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMEMLIMIT
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.memory
diff --git a/manifests/bases/image-reflector-controller/kustomization.yaml b/manifests/bases/image-reflector-controller/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.31.1/image-reflector-controller.crds.yaml
-- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.31.1/image-reflector-controller.deployment.yaml
+- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.32.0/image-reflector-controller.crds.yaml
+- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.32.0/image-reflector-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

diff --git a/manifests/bases/image-reflector-controller/patch.yaml b/manifests/bases/image-reflector-controller/patch.yaml
@@ -4,3 +4,19 @@
 - op: add
   path: /spec/template/spec/serviceAccountName
   value: image-reflector-controller
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMAXPROCS
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.cpu
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMEMLIMIT
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.memory
diff --git a/manifests/bases/kustomize-controller/kustomization.yaml b/manifests/bases/kustomize-controller/kustomization.yaml
@@ -1,9 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/kustomize-controller/releases/download/v1.2.0/kustomize-controller.crds.yaml
-#- https://github.com/fluxcd/kustomize-controller/config/crd?ref=main
-- https://github.com/fluxcd/kustomize-controller/releases/download/v1.2.0/kustomize-controller.deployment.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v1.3.0/kustomize-controller.crds.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v1.3.0/kustomize-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

diff --git a/manifests/bases/kustomize-controller/patch.yaml b/manifests/bases/kustomize-controller/patch.yaml
@@ -7,3 +7,19 @@
 - op: add
   path: /spec/template/spec/priorityClassName
   value: system-cluster-critical
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMAXPROCS
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.cpu
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMEMLIMIT
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.memory
diff --git a/manifests/bases/notification-controller/kustomization.yaml b/manifests/bases/notification-controller/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/notification-controller/releases/download/v1.2.2/notification-controller.crds.yaml
-- https://github.com/fluxcd/notification-controller/releases/download/v1.2.2/notification-controller.deployment.yaml
+- https://github.com/fluxcd/notification-controller/releases/download/v1.3.0/notification-controller.crds.yaml
+- https://github.com/fluxcd/notification-controller/releases/download/v1.3.0/notification-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

diff --git a/manifests/bases/notification-controller/patch.yaml b/manifests/bases/notification-controller/patch.yaml
@@ -1,3 +1,19 @@
 - op: add
   path: /spec/template/spec/serviceAccountName
   value: notification-controller
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMAXPROCS
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.cpu
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMEMLIMIT
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.memory
diff --git a/manifests/bases/source-controller/kustomization.yaml b/manifests/bases/source-controller/kustomization.yaml
@@ -1,9 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/source-controller/releases/download/v1.2.2/source-controller.crds.yaml
-#- https://github.com/fluxcd/source-controller/config/crd?ref=main
-- https://github.com/fluxcd/source-controller/releases/download/v1.2.2/source-controller.deployment.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v1.3.0/source-controller.crds.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v1.3.0/source-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

diff --git a/manifests/bases/source-controller/patch.yaml b/manifests/bases/source-controller/patch.yaml
@@ -7,3 +7,19 @@
 - op: add
   path: /spec/template/spec/priorityClassName
   value: system-cluster-critical
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMAXPROCS
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.cpu
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: GOMEMLIMIT
+    valueFrom:
+      resourceFieldRef:
+        containerName: manager
+        resource: limits.memory
diff --git a/manifests/install/kustomization.yaml b/manifests/install/kustomization.yaml
@@ -20,6 +20,7 @@ images:
     newName: ghcr.io/fluxcd/kustomize-controller
   - name: fluxcd/helm-controller
     newName: ghcr.io/fluxcd/helm-controller
+    newTag: preview-9da55991
   - name: fluxcd/notification-controller
     newName: ghcr.io/fluxcd/notification-controller
   - name: fluxcd/image-reflector-controller
@@ -34,13 +35,6 @@ patches:
     target:
       kind: Deployment
       name: "(helm-controller|source-controller)"
-  - patch: |
-      - op: add
-        path: /spec/template/spec/containers/0/args/-
-        value: --snapshot-digest-algo=blake3
-    target:
-      kind: Deployment
-      name: helm-controller
   - patch: |
       apiVersion: apps/v1
       kind: Deployment