Skip to content

Commit

Permalink
Remove version label from database labels (#644)
Browse files Browse the repository at this point in the history
Signed-off-by: suaas21 <[email protected]>
  • Loading branch information
suaas21 authored Nov 10, 2020
1 parent 52b04a2 commit 1387ac1
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 11 deletions.
1 change: 0 additions & 1 deletion apis/kubedb/v1alpha2/elasticsearch_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ func (e Elasticsearch) OffshootSelectors() map[string]string {
func (e Elasticsearch) OffshootLabels() map[string]string {
out := e.OffshootSelectors()
out[meta_util.NameLabelKey] = ResourceSingularElasticsearch
out[meta_util.VersionLabelKey] = string(e.Spec.Version)
out[meta_util.InstanceLabelKey] = e.Name
out[meta_util.ComponentLabelKey] = ComponentDatabase
out[meta_util.ManagedByLabelKey] = kubedb.GroupName
Expand Down
1 change: 0 additions & 1 deletion apis/kubedb/v1alpha2/etcd_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ func (e Etcd) OffshootSelectors() map[string]string {
func (e Etcd) OffshootLabels() map[string]string {
out := e.OffshootSelectors()
out[meta_util.NameLabelKey] = ResourceSingularEtcd
out[meta_util.VersionLabelKey] = string(e.Spec.Version)
out[meta_util.InstanceLabelKey] = e.Name
out[meta_util.ComponentLabelKey] = ComponentDatabase
out[meta_util.ManagedByLabelKey] = kubedb.GroupName
Expand Down
1 change: 0 additions & 1 deletion apis/kubedb/v1alpha2/mariadb_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ func (m MariaDB) OffshootSelectors() map[string]string {
func (m MariaDB) OffshootLabels() map[string]string {
out := m.OffshootSelectors()
out[meta_util.NameLabelKey] = ResourceSingularMariaDB
out[meta_util.VersionLabelKey] = string(m.Spec.Version)
out[meta_util.InstanceLabelKey] = m.Name
out[meta_util.ComponentLabelKey] = ComponentDatabase
out[meta_util.ManagedByLabelKey] = kubedb.GroupName
Expand Down
1 change: 0 additions & 1 deletion apis/kubedb/v1alpha2/memcached_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ func (m Memcached) OffshootSelectors() map[string]string {
func (m Memcached) OffshootLabels() map[string]string {
out := m.OffshootSelectors()
out[meta_util.NameLabelKey] = ResourceSingularMemcached
out[meta_util.VersionLabelKey] = string(m.Spec.Version)
out[meta_util.InstanceLabelKey] = m.Name
out[meta_util.ComponentLabelKey] = ComponentDatabase
out[meta_util.ManagedByLabelKey] = kubedb.GroupName
Expand Down
1 change: 0 additions & 1 deletion apis/kubedb/v1alpha2/mongodb_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ func (m MongoDB) MongosSelectors() map[string]string {
func (m MongoDB) OffshootLabels() map[string]string {
out := m.OffshootSelectors()
out[meta_util.NameLabelKey] = ResourceSingularMongoDB
out[meta_util.VersionLabelKey] = string(m.Spec.Version)
out[meta_util.InstanceLabelKey] = m.Name
out[meta_util.ComponentLabelKey] = ComponentDatabase
out[meta_util.ManagedByLabelKey] = kubedb.GroupName
Expand Down
1 change: 0 additions & 1 deletion apis/kubedb/v1alpha2/mysql_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ func (m MySQL) OffshootSelectors() map[string]string {
func (m MySQL) OffshootLabels() map[string]string {
out := m.OffshootSelectors()
out[meta_util.NameLabelKey] = ResourceSingularMySQL
out[meta_util.VersionLabelKey] = string(m.Spec.Version)
out[meta_util.InstanceLabelKey] = m.Name
out[meta_util.ComponentLabelKey] = ComponentDatabase
out[meta_util.ManagedByLabelKey] = kubedb.GroupName
Expand Down
1 change: 0 additions & 1 deletion apis/kubedb/v1alpha2/perconaxtradb_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ func (p PerconaXtraDB) OffshootSelectors() map[string]string {
func (p PerconaXtraDB) OffshootLabels() map[string]string {
out := p.OffshootSelectors()
out[meta_util.NameLabelKey] = ResourceSingularPerconaXtraDB
out[meta_util.VersionLabelKey] = string(p.Spec.Version)
out[meta_util.InstanceLabelKey] = p.Name
out[meta_util.ComponentLabelKey] = ComponentDatabase
out[meta_util.ManagedByLabelKey] = kubedb.GroupName
Expand Down
1 change: 0 additions & 1 deletion apis/kubedb/v1alpha2/pgbouncer_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ func (p PgBouncer) OffshootLabels() map[string]string {
out[meta_util.NameLabelKey] = ResourceSingularPgBouncer
out[meta_util.InstanceLabelKey] = p.Name
out[meta_util.ComponentLabelKey] = "connection-pooler"
out[meta_util.VersionLabelKey] = string(p.Spec.Version)
out[meta_util.ManagedByLabelKey] = kubedb.GroupName
return meta_util.FilterKeys(kubedb.GroupName, out, p.Labels)
}
Expand Down
1 change: 0 additions & 1 deletion apis/kubedb/v1alpha2/postgres_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ func (p Postgres) OffshootSelectors() map[string]string {
func (p Postgres) OffshootLabels() map[string]string {
out := p.OffshootSelectors()
out[meta_util.NameLabelKey] = ResourceSingularPostgres
out[meta_util.VersionLabelKey] = string(p.Spec.Version)
out[meta_util.InstanceLabelKey] = p.Name
out[meta_util.ComponentLabelKey] = ComponentDatabase
out[meta_util.ManagedByLabelKey] = kubedb.GroupName
Expand Down
1 change: 0 additions & 1 deletion apis/kubedb/v1alpha2/proxysql_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ func (p ProxySQL) OffshootSelectors() map[string]string {
func (p ProxySQL) OffshootLabels() map[string]string {
out := p.OffshootSelectors()
out[meta_util.NameLabelKey] = ResourceSingularProxySQL
out[meta_util.VersionLabelKey] = string(p.Spec.Version)
out[meta_util.InstanceLabelKey] = p.Name
out[meta_util.ComponentLabelKey] = ComponentDatabase
out[meta_util.ManagedByLabelKey] = kubedb.GroupName
Expand Down
1 change: 0 additions & 1 deletion apis/kubedb/v1alpha2/redis_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ func (r Redis) OffshootSelectors() map[string]string {
func (r Redis) OffshootLabels() map[string]string {
out := r.OffshootSelectors()
out[meta_util.NameLabelKey] = ResourceSingularRedis
out[meta_util.VersionLabelKey] = string(r.Spec.Version)
out[meta_util.InstanceLabelKey] = r.Name
out[meta_util.ComponentLabelKey] = ComponentDatabase
out[meta_util.ManagedByLabelKey] = kubedb.GroupName
Expand Down

0 comments on commit 1387ac1

Please sign in to comment.