Skip to content

Commit ff3dcda

Browse files
Backport of Fix for the consul-injector-webhook issue during the OCP upgrade causing upgrade halt or cluster inaccessible into release/1.8.x (#5417)
backport of commit 7ab2dbf Co-authored-by: vdinesh4738 <dinesh.vadlamudi@hashicorp.com>
1 parent 9e804dd commit ff3dcda

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

.changelog/5402.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
helm: Exclude OpenShift namespaces from the consul-connect-inject webhook injection by default
3+
```

charts/consul/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2890,6 +2890,7 @@ connectInject:
28902890
# want those pods injected and local-path-storage and openebs so that
28912891
# Kind (Kubernetes In Docker) and [OpenEBS](https://openebs.io/) respectively can provision Pods used to create PVCs.
28922892
# We also exclude gmp-system and gke-managed-cim namespaces that are used by GKE for managing the cluster.
2893+
# We also exclude any namespaces with the label `openshift.io/cluster-monitoring` since those are used by OpenShift for cluster monitoring and typically should not be injected.
28932894
# Note that this exclusion is only supported in Kubernetes v1.21.1+.
28942895
#
28952896
# Example:
@@ -2905,6 +2906,8 @@ connectInject:
29052906
- key: "kubernetes.io/metadata.name"
29062907
operator: "NotIn"
29072908
values: ["kube-system","local-path-storage","openebs","gmp-system","gke-managed-cim"]
2909+
- key: "openshift.io/cluster-monitoring"
2910+
operator: "DoesNotExist"
29082911
29092912
# List of k8s namespaces to allow Connect sidecar
29102913
# injection in. If a k8s namespace is not included or is listed in `k8sDenyNamespaces`,

0 commit comments

Comments
 (0)