Skip to content

Commit

Permalink
[Fix] Deployment selector labels and name of busola UI ConfigMap fixed (
Browse files Browse the repository at this point in the history
  • Loading branch information
anirudhprasad-sap authored Jan 11, 2024
1 parent 40c6134 commit 96f4daa
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 27 deletions.
10 changes: 5 additions & 5 deletions config/busola/capapplication_configMap.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: capapplications.sme.sap.com
name: cap-operator-capapplications.sme.sap.com
labels:
app.kubernetes.io/name: capapplications.sme.sap.com
app.kubernetes.io/instance: capapplications.sme.sap.com
app.kubernetes.io/name: cap-operator-capapplications.sme.sap.com
app.kubernetes.io/instance: cap-operator-capapplications.sme.sap.com
app.kubernetes.io/component: configmap
busola.io/extension: resource
busola.io/extension-version: '0.5'
Expand Down Expand Up @@ -97,7 +97,7 @@ data:
widget: EventList
filter: '$matchEvents($$, $root.kind, $root.metadata.name)'
defaultType: all
hideInvolvedObjects: true
hideInvolvedObjects: true
form: |
[]
general: |
Expand Down Expand Up @@ -132,4 +132,4 @@ data:
translations: |
en:
metadata.annotations: Annotations
metadata.labels: Labels
metadata.labels: Labels
8 changes: 4 additions & 4 deletions config/busola/capapplicationversion_configMap.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
kind: ConfigMap
apiVersion: v1
metadata:
name: capapplicationversions.sme.sap.com
name: cap-operator-capapplicationversions.sme.sap.com
labels:
app.kubernetes.io/name: capapplicationversions.sme.sap.com
app.kubernetes.io/instance: capapplicationversions.sme.sap.com
app.kubernetes.io/name: cap-operator-capapplicationversions.sme.sap.com
app.kubernetes.io/instance: cap-operator-capapplicationversions.sme.sap.com
app.kubernetes.io/component: configmap
busola.io/extension: resource
busola.io/extension-version: '0.5'
data:
details: |
header:
header:
- source: metadata.ownerReferences
widget: ControlledBy
name: Owned By
Expand Down
6 changes: 3 additions & 3 deletions config/busola/capoperator_configMap.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: capoperators.operator.sme.sap.com
name: cap-operator-capoperators.operator.sme.sap.com
labels:
app.kubernetes.io/name: capoperators.operator.sme.sap.com
app.kubernetes.io/instance: capoperators.operator.sme.sap.com
app.kubernetes.io/name: cap-operator-capoperators.operator.sme.sap.com
app.kubernetes.io/instance: cap-operator-capoperators.operator.sme.sap.com
app.kubernetes.io/component: configmap
busola.io/extension: resource
busola.io/extension-version: '0.5'
Expand Down
10 changes: 5 additions & 5 deletions config/busola/captenant_configMap.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
kind: ConfigMap
apiVersion: v1
metadata:
name: captenants.sme.sap.com
name: cap-operator-captenants.sme.sap.com
labels:
app.kubernetes.io/name: captenants.sme.sap.com
app.kubernetes.io/instance: captenants.sme.sap.com
app.kubernetes.io/name: cap-operator-captenants.sme.sap.com
app.kubernetes.io/instance: cap-operator-captenants.sme.sap.com
app.kubernetes.io/component: configmap
busola.io/extension: resource
busola.io/extension-version: '0.5'
Expand Down Expand Up @@ -42,7 +42,7 @@ data:
source: spec.version
- name: Version Upgrade Strategy
source: >-
spec.versionUpgradeStrategy = "always" ? "Always" : "Never"
spec.versionUpgradeStrategy = "always" ? "Always" : "Never"
- name: Current CAP Application Version
source: status.currentCAPApplicationVersionInstance
widget: ResourceLink
Expand Down Expand Up @@ -177,4 +177,4 @@ data:
en:
metadata.annotations: Annotations
metadata.labels: Labels
metadata.creationTimestamp: Created at
metadata.creationTimestamp: Created at
12 changes: 6 additions & 6 deletions config/busola/captenantoperation_configMap.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
kind: ConfigMap
apiVersion: v1
metadata:
name: captenantoperations.sme.sap.com
name: cap-operator-captenantoperations.sme.sap.com
labels:
app.kubernetes.io/name: captenantoperations.sme.sap.com
app.kubernetes.io/instance: captenantoperations.sme.sap.com
app.kubernetes.io/name: cap-operator-captenantoperations.sme.sap.com
app.kubernetes.io/instance: cap-operator-captenantoperations.sme.sap.com
app.kubernetes.io/component: configmap
busola.io/extension: resource
busola.io/extension-version: '0.5'
Expand All @@ -15,10 +15,10 @@ data:
kind: Job
group: batch
version: v1
filter: >-
filter: >-
$item.metadata.annotations.`sme.sap.com/owner-identifier` = $join([$root.metadata.namespace,".",$root.metadata.name])
details: |
header:
header:
- source: metadata.ownerReferences
widget: ControlledBy
name: Owned By
Expand Down Expand Up @@ -109,4 +109,4 @@ data:
en:
metadata.annotations: Annotations
metadata.labels: Labels
metadata.creationTimestamp: Created at
metadata.creationTimestamp: Created at
6 changes: 3 additions & 3 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ kind: Kustomization
# Adds namespace to all resources.
namespace: cap-operator-system

# Value of this field is prepended to the names of all resources,
# Value of this field is prepended to the names of all resources,
# e.g. a deployment named "wordpress" becomes "alices-wordpress".
# Note that it should also match with the prefix (text before '-') of the namespace field above.
# namePrefix: cap-operator-

# Labels to add to all resources and selectors.
labels:
- includeSelectors: true
- includeSelectors: false
pairs:
app.kubernetes.io/version: latest
kyma-project.io/module: cap-operator
Expand All @@ -26,4 +26,4 @@ resources:
images:
- name: controller
newName: ghcr.io/sap/cap-operator-lifecycle/cap-operator-manager
newTag: latest
newTag: latest
9 changes: 8 additions & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,20 @@ metadata:
app.kubernetes.io/component: controller
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/part-of: cap-operator-manager
kyma-project.io/module: cap-operator
template:
metadata:
annotations:
kubectl.kubernetes.io/default-container: manager
labels:
app.kubernetes.io/part-of: cap-operator-manager
kyma-project.io/module: cap-operator
spec:
# TODO(user): Uncomment the following code to configure the nodeAffinity expression
# according to the platforms which are supported by your solution.
# according to the platforms which are supported by your solution.
# It is considered best practice to support multiple architectures. You can
# build your manager image using the makefile target docker-buildx.
# affinity:
Expand Down

0 comments on commit 96f4daa

Please sign in to comment.