Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove cert-manager. #283

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions charts/kubewarden-controller/chart-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,9 @@ nodeSelector: {}
tolerations: []
affinity: {}
tls:
# source options:
# - "cert-manager-self-signed": Scaffold cert-manager integration, and create
# a self-signed certificate with a cert-manager self-signed Issuer. Depends
# on cert-manager. (default)
# - "cert-manager": Scafffold cert-manager integration. User configures their
# own Issuer. Depends on cert-manager. Set tls.certManagerIssuerName to the
# desired Issuer.
source: cert-manager-self-signed
# "cert-manager"-only options:
certManagerIssuerName: ""
# secret used to store the certificate and key used by the controller webhook
# server.
controllerCertificateSecretName: "kubewarden-controller-certificate"
# Resource limits & requests
# Ref: https://kubernetes.io/docs/user-guide/compute-resources/
resources:
Expand Down
19 changes: 0 additions & 19 deletions charts/kubewarden-controller/questions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,3 @@ questions:
allow viewing secrets, roles or role bindings), and "audit-scanner-cluster-role"
(allows read-write to Kubewarden resources and PolicyReports).
group: "Features"
- variable: tls.source
default: "cert-manager-self-signed"
description: "Source for TLS certificates"
label: TLS certificates source
type: enum
options:
- "cert-manager-self-signed"
- "cert-manager"
show_subquestion_if: "cert-manager"
group: "Certificates"
subquestions:
- variable: "tls.certManagerIssuerName"
type: string
default: ""
label: cert-manager Issuer name
description: |
Name of cert-manager Issuer
group: "Certificates"
show_if: "tls.source=cert-manager"
35 changes: 0 additions & 35 deletions charts/kubewarden-controller/templates/cert-tls.yaml

This file was deleted.

5 changes: 4 additions & 1 deletion charts/kubewarden-controller/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ spec:
- --enable-metrics
{{- end }}
- --always-accept-admission-reviews-on-deployments-namespace
- --controller-webhook-service-name={{ include "kubewarden-controller.fullname" . }}-webhook-service
command:
- /manager
{{- if .Values.telemetry.enabled }}
Expand Down Expand Up @@ -83,7 +84,9 @@ spec:
- name: cert
secret:
defaultMode: 420
secretName: webhook-server-cert
secretName: {{ .Values.tls.controllerCertificateSecretName }}
# This needs to be optional because the secret is created by the controller
optional: true
{{- if .Values.podSecurityContext }}
securityContext:
{{ toYaml .Values.podSecurityContext | indent 8 }}
Expand Down
1 change: 1 addition & 0 deletions charts/kubewarden-controller/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ rules:
- list
- patch
- watch
- get
- apiGroups:
- policies.kubewarden.io
resources:
Expand Down
2 changes: 0 additions & 2 deletions charts/kubewarden-controller/templates/webhooks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
metadata:
annotations:
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "kubewarden-controller.fullname" . }}-serving-cert
{{- include "kubewarden-controller.annotations" . | nindent 4 }}
name: kubewarden-controller-mutating-webhook-configuration
labels:
Expand Down Expand Up @@ -78,7 +77,6 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
annotations:
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "kubewarden-controller.fullname" . }}-serving-cert
{{- include "kubewarden-controller.annotations" . | nindent 4 }}
name: kubewarden-controller-validating-webhook-configuration
labels:
Expand Down
13 changes: 3 additions & 10 deletions charts/kubewarden-controller/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,9 @@ nodeSelector: {}
tolerations: []
affinity: {}
tls:
# source options:
# - "cert-manager-self-signed": Scaffold cert-manager integration, and create
# a self-signed certificate with a cert-manager self-signed Issuer. Depends
# on cert-manager. (default)
# - "cert-manager": Scafffold cert-manager integration. User configures their
# own Issuer. Depends on cert-manager. Set tls.certManagerIssuerName to the
# desired Issuer.
source: cert-manager-self-signed
# "cert-manager"-only options:
certManagerIssuerName: ""
# secret used to store the certificate and key used by the controller webhook
# server.
controllerCertificateSecretName: "kubewarden-controller-certificate"
# Resource limits & requests
# Ref: https://kubernetes.io/docs/user-guide/compute-resources/
resources:
Expand Down
Loading