Remove cert-manager deps.

Signed-off-by: d-kuro <[email protected]>

.github/workflows/helm.yaml

@@ -48,8 +48,8 @@ jobs:
         uses: helm/[email protected]
         if: steps.list-changed.outputs.changed == 'true'
 
-      - name: Apply cert-manager CRDs
-        run: kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.5.1/cert-manager.crds.yaml
+      - name: Apply cert-manager
+        run: kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.5.1/cert-manager.yaml
 
       - name: Run chart-testing (install)
         run: ct install --config ct.yaml

charts/accurate/Chart.yaml

@@ -22,9 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: 0.1.0
-
-dependencies:
-  - name: cert-manager
-    repository: https://charts.jetstack.io
-    version: 1.5.1
-    condition: cert-manager.enabled

charts/accurate/README.md

@@ -55,11 +55,11 @@ helm install --create-namespace --namespace accurate accurate accurate/accurate
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| cert-manager.enabled | bool | `false` | Install cert-manager together. |
 | controller.additionalRBAC.rules | list | `[]` | Specify the RBAC rules to be added to the controller. ClusterRole and ClusterRoleBinding are created with the names `{{ release name }}-additional-resources`. The rules defined here will be used for the ClusterRole rules. |
 | controller.config.annotationKeys | list | `[]` | Annotations to be propagated to sub-namespaces. It is also possible to specify a glob pattern that can be interpreted by Go's "path.Match" func. |
 | controller.config.labelKeys | list | `[]` | Labels to be propagated to sub-namespaces. It is also possible to specify a glob pattern that can be interpreted by Go's "path.Match" func. |
 | controller.config.watches | list | `[{"group":"rbac.authorization.k8s.io","kind":"Role","version":"v1"},{"group":"rbac.authorization.k8s.io","kind":"RoleBinding","version":"v1"},{"kind":"Secret","version":"v1"}]` | List of GVK for namespace-scoped resources that can be propagated. Any namespace-scoped resource is allowed. |
+| controller.extraArgs | list | `[]` | Optional additional arguments. |
 | controller.replicas | int | `2` | Specify the number of replicas of the controller Pod. |
 | controller.resources | object | `{"requests":{"cpu":"100m","memory":"20Mi"}}` | Specify resources. |
 | controller.terminationGracePeriodSeconds | int | `10` | Specify terminationGracePeriodSeconds. |

charts/accurate/templates/deployment.yaml

@@ -26,6 +26,9 @@ spec:
           {{- with .Values.image.pullPolicy }}
           imagePullPolicy: {{ . }}
           {{- end }}
+          {{- with .Values.controller.extraArgs }}
+          args: {{ . }}
+          {{- end }}
           ports:
             - containerPort: 9443
               name: webhook-server

charts/accurate/values.yaml

@@ -22,6 +22,9 @@ controller:
   # controller.terminationGracePeriodSeconds -- Specify terminationGracePeriodSeconds.
   terminationGracePeriodSeconds: 10
 
+  # controller.extraArgs -- Optional additional arguments.
+  extraArgs: []
+
   config:
     # controller.config.labelKeys -- Labels to be propagated to sub-namespaces.
     # It is also possible to specify a glob pattern that can be interpreted by Go's "path.Match" func.
@@ -66,8 +69,3 @@ controller:
     #     - update
     #     - patch
     #     - delete
-
-cert-manager:
-  # cert-manager.enabled -- Install cert-manager together.
-  ## ref: https://cert-manager.io/docs/installation/kubernetes/#installing-with-helm
-  enabled: false

ct.yaml

@@ -2,5 +2,3 @@
 target-branch: main
 validate-maintainers: false
 check-version-increment: true
-chart-repos:
-  - jetstack=https://charts.jetstack.io

e2e/Makefile

@@ -29,14 +29,10 @@ start: $(KIND) $(KUBECTL) $(HELM) $(KUBESEAL) $(KUBECTL_ACCURATE)
 	$(KIND) load docker-image accurate:dev --name=accurate
 	$(KUBECTL) apply -f https://github.com/jetstack/cert-manager/releases/download/v$(CERT_MANAGER_VERSION)/cert-manager.yaml
 	$(KUBECTL) -n cert-manager wait --for=condition=available --timeout=180s --all deployments
-	$(HELM) repo add jetstack https://charts.jetstack.io
-	$(HELM) repo update
-	$(HELM) dependency build ../charts/accurate/
 	$(HELM) install --create-namespace --namespace accurate accurate ../charts/accurate -f values.yaml
 	$(KUBECTL) -n accurate wait --for=condition=available --timeout=180s --all deployments
 	$(KUBECTL) apply -f https://github.com/bitnami-labs/sealed-secrets/releases/download/v$(SEALED_SECRET_VERSION)/controller.yaml
 	$(KUBECTL) -n kube-system wait --for=condition=available --timeout=180s --all deployments
-	$(KUBECTL) apply -f clusterrole_for_sealedsecrets.yaml
 	rm -f sealed.json
 	$(KUBECTL) -n root2 create secret generic mysecret --dry-run=client --from-literal=foo=bar -o json | \
 		$(KUBESEAL) | jq '. * {metadata: {annotations: {"accurate.cybozu.com/propagate-generated": "create"}}}' > sealed.json

e2e/values.yaml

@@ -4,6 +4,9 @@ image:
   pullPolicy: Never
 
 controller:
+  extraArgs:
+    - --zap-log-level=5
+
   config:
     labelKeys:
       - team
@@ -20,3 +23,14 @@ controller:
         kind: RoleBinding
       - version: v1
         kind: Secret
+
+  additionalRBAC:
+    rules:
+      - apiGroups:
+          - bitnami.com
+        resources:
+          - sealedsecrets
+        verbs:
+          - get
+          - list
+          - watch