diff --git a/deploy/charts/cert-manager/templates/rbac.yaml b/deploy/charts/cert-manager/templates/rbac.yaml index 24c8ef7c0..194f18351 100644 --- a/deploy/charts/cert-manager/templates/rbac.yaml +++ b/deploy/charts/cert-manager/templates/rbac.yaml @@ -213,14 +213,12 @@ rules: - apiGroups: ["extensions"] resources: ["ingresses"] verbs: ["get", "list", "watch", "create", "delete", "update"] -{{- if .Values.global.isOpenshift }} # We require the ability to specify a custom hostname when we are creating # new ingress resources. # See: https://github.com/openshift/origin/blob/21f191775636f9acadb44fa42beeb4f75b255532/pkg/route/apiserver/admission/ingress_admission.go#L84-L148 - apiGroups: ["route.openshift.io"] resources: ["routes/custom-host"] verbs: ["create"] -{{- end }} # We require these rules to support users with the OwnerReferencesPermissionEnforcement # admission controller enabled: # https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#ownerreferencespermissionenforcement diff --git a/deploy/charts/cert-manager/values.yaml b/deploy/charts/cert-manager/values.yaml index 93e8fbb28..5efb68e1a 100644 --- a/deploy/charts/cert-manager/values.yaml +++ b/deploy/charts/cert-manager/values.yaml @@ -6,7 +6,6 @@ global: ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ ## imagePullSecrets: [] - isOpenshift: false # - name: "image-pull-secret" # Optional priority class to be used for the cert-manager pods diff --git a/deploy/manifests/BUILD.bazel b/deploy/manifests/BUILD.bazel index 255185811..019062b71 100644 --- a/deploy/manifests/BUILD.bazel +++ b/deploy/manifests/BUILD.bazel @@ -14,9 +14,7 @@ VARIANTS = { "cert-manager-no-webhook": { "webhook.enabled": "false", }, - "cert-manager-openshift": { - "global.isOpenshift": "true", - }, + "cert-manager-openshift": {}, } [helm_tmpl(