Skip to content

Commit

Permalink
remove kustomize commonLabels (kedacore#5888)
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Wright <danielwright@bitgo.com>
Signed-off-by: uucloud <uucloud@qq.com>
  • Loading branch information
therealdwright authored and uucloud committed Jul 11, 2024
1 parent b4b38a0 commit f68db59
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
- TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
- **General**: Add --ca-dir flag to KEDA operator to specify directories with CA certificates for scalers to authenticate TLS connections (defaults to /custom/ca) ([#5860](https://github.com/kedacore/keda/issues/5860))
- **General**: Declarative parsing of scaler config ([#5037](https://github.com/kedacore/keda/issues/5037)|[#5797](https://github.com/kedacore/keda/issues/5797))
- **General**: Remove deprecated Kustomize commonLabels ([#5888](https://github.com/kedacore/keda/pull/5888))
- **General**: Support for Kubernetes v1.30 ([#5828](https://github.com/kedacore/keda/issues/5828))

#### Experimental
Expand Down
6 changes: 4 additions & 2 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
#namePrefix: keda-

# Labels to add to all resources and selectors.
#commonLabels:
# someName: someValue
# labels:
# - pairs:
# someName: someValue
# includeSelectors: true

# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
#- ../prometheus
Expand Down
6 changes: 4 additions & 2 deletions config/minimal/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
#namePrefix: keda-

# Labels to add to all resources and selectors.
#commonLabels:
# someName: someValue
# labels:
# - pairs:
# someName: someValue
# includeSelectors: true

# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
#- ../prometheus
Expand Down
9 changes: 6 additions & 3 deletions config/rbac/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
commonLabels:
app.kubernetes.io/name: keda-operator
app.kubernetes.io/part-of: keda-operator

labels:
- pairs:
app.kubernetes.io/name: keda-operator
app.kubernetes.io/part-of: keda-operator
includeSelectors: true

resources:
- role.yaml
Expand Down

0 comments on commit f68db59

Please sign in to comment.