From 49384667b9c1bdca848702ae8105b94d5fd13e2f Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 11:13:29 +0600 Subject: [PATCH 01/24] Add methods for create and great db user role for elasticsearch. Signed-off-by: Pritam --- elasticsearch/api.go | 25 +++++++++-- elasticsearch/es_client_v5.go | 4 ++ elasticsearch/es_client_v6.go | 4 ++ elasticsearch/es_client_v7.go | 85 +++++++++++++++++++++++++++++++++++ elasticsearch/es_client_v8.go | 85 +++++++++++++++++++++++++++++++++++ elasticsearch/os_client_v1.go | 4 ++ elasticsearch/os_client_v2.go | 4 ++ 7 files changed, 208 insertions(+), 3 deletions(-) diff --git a/elasticsearch/api.go b/elasticsearch/api.go index 4a513da34..b90077769 100644 --- a/elasticsearch/api.go +++ b/elasticsearch/api.go @@ -25,9 +25,27 @@ import ( ) var ( - writeRequestIndex = "kubedb-system" - writeRequestID = "info" - writeRequestType = "_doc" + writeRequestIndex = "kubedb-system" + writeRequestID = "info" + writeRequestType = "_doc" + CustomUser = "custom-user" + PrivilegeReadKey = "read" + PrivilegeWriteKey = "write" + PrivilegeCreateIndexKey = "create-index" + Any = "*" + All = "all" + Names = "names" + Privileges = "privileges" + AllowRestrictedIndices = "allow_restricted_indices" + Enabled = "enabled" + Cluster = "cluster" + Indices = "indices" + Applications = "applications" + Application = "application" + RunAs = "run_as" + TransientMetadata = "transient_metadata" + Resources = "resources" + Kibana = "kibana-.kibana" ) type WriteRequestIndex struct { @@ -48,4 +66,5 @@ type ESClient interface { GetClusterWriteStatus(ctx context.Context, db *api.Elasticsearch) error GetClusterReadStatus(ctx context.Context, db *api.Elasticsearch) error GetTotalDiskUsage(ctx context.Context) (string, error) + EnsureDBUserRole(ctx context.Context) error } diff --git a/elasticsearch/es_client_v5.go b/elasticsearch/es_client_v5.go index 80e383b7a..2dab7f87d 100644 --- a/elasticsearch/es_client_v5.go +++ b/elasticsearch/es_client_v5.go @@ -88,3 +88,7 @@ func (es *ESClientV5) GetClusterReadStatus(ctx context.Context, db *api.Elastics func (es *ESClientV5) GetTotalDiskUsage(ctx context.Context) (string, error) { return "", nil } + +func (es *ESClientV5) EnsureDBUserRole(ctx context.Context) error { + return errors.New("not supported in es version 5") +} diff --git a/elasticsearch/es_client_v6.go b/elasticsearch/es_client_v6.go index 6227a96d4..76ba1c218 100644 --- a/elasticsearch/es_client_v6.go +++ b/elasticsearch/es_client_v6.go @@ -212,3 +212,7 @@ func (es *ESClientV6) GetClusterReadStatus(ctx context.Context, db *api.Elastics func (es *ESClientV6) GetTotalDiskUsage(ctx context.Context) (string, error) { return "", nil } + +func (es *ESClientV6) EnsureDBUserRole(ctx context.Context) error { + return errors.New("not supported in es version 6") +} diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index f9102da32..02285b3db 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -17,6 +17,7 @@ limitations under the License. package elasticsearch import ( + "bytes" "context" "encoding/json" "fmt" @@ -301,3 +302,87 @@ func (es *ESClientV7) GetTotalDiskUsage(ctx context.Context) (string, error) { return totalDiskUsage, nil } + +func (es *ESClientV7) getDBUserRole(ctx context.Context) (error, bool) { + req := esapi.SecurityGetRoleRequest{ + Name: []string{CustomUser}, + } + res, err := req.Do(ctx, es.client.Transport) + defer func(Body io.ReadCloser) { + err := Body.Close() + if err != nil { + klog.Errorf("failed to close response body from GetDBUser", err) + } + }(res.Body) + // bd, err := io.ReadAll(res.Body) + // fmt.Println("retrieved role------------------>", string(bd)) + + if err != nil { + fmt.Println("faced error while making request in getdbuserrole function") + return err, false + } + if res.IsError() { + return err, false + } + + return nil, true +} + +func (es *ESClientV7) EnsureDBUserRole(ctx context.Context) error { + err, flg := es.getDBUserRole(ctx) + + if err != nil { + return err + } + if !flg { + elasticMap := map[string]interface{}{ + Names: []string{All}, + Privileges: []string{PrivilegeReadKey, PrivilegeWriteKey, PrivilegeCreateIndexKey}, + AllowRestrictedIndices: false, + } + applicationMap := map[string]interface{}{ + Application: Kibana, + Privileges: []string{PrivilegeReadKey, PrivilegeWriteKey}, + Resources: []string{Any}, + } + transientMetaMap := map[string]interface{}{ + Enabled: true, + } + userRoleReqMap := map[string]interface{}{ + Cluster: []string{All}, + Indices: []map[string]interface{}{elasticMap}, + Applications: []map[string]interface{}{applicationMap}, + RunAs: []string{}, + TransientMetadata: transientMetaMap, + } + // fmt.Println(map1) + jsonStr, err := json.Marshal(userRoleReqMap) + if err != nil { + fmt.Printf("Error: %s", err.Error()) + return err + + } else { + fmt.Println(string(jsonStr)) + } + body := bytes.NewReader(jsonStr) + req := esapi.SecurityPutRoleRequest{ + Name: CustomUser, + Body: body, + } + + res, err := req.Do(ctx, es.client.Transport) + defer func(Body io.ReadCloser) { + err := Body.Close() + if err != nil { + klog.Errorf("failed to close response body from GetDBUser", err) + } + }(res.Body) + if err != nil { + fmt.Println("faced error while making request in ensuredbuserrole function") + return err + + } + + } + return nil +} diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index bf498186c..a30e019de 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -17,6 +17,7 @@ limitations under the License. package elasticsearch import ( + "bytes" "context" "encoding/json" "fmt" @@ -300,3 +301,87 @@ func (es *ESClientV8) GetTotalDiskUsage(ctx context.Context) (string, error) { return totalDiskUsage, nil } + +func (es *ESClientV8) getDBUserRole(ctx context.Context) (error, bool) { + req := esapi.SecurityGetRoleRequest{ + Name: []string{CustomUser}, + } + res, err := req.Do(ctx, es.client.Transport) + defer func(Body io.ReadCloser) { + err := Body.Close() + if err != nil { + klog.Errorf("failed to close response body from GetDBUser", err) + } + }(res.Body) + // bd, err := io.ReadAll(res.Body) + // fmt.Println("retrieved role------------------>", string(bd)) + + if err != nil { + fmt.Println("faced error while making request in getdbuserrole function") + return err, false + } + if res.IsError() { + return err, false + } + + return nil, true +} + +func (es *ESClientV8) EnsureDBUserRole(ctx context.Context) error { + err, flg := es.getDBUserRole(ctx) + + if err != nil { + return err + } + if !flg { + dbPrivileges := map[string]interface{}{ + Names: []string{All}, + Privileges: []string{PrivilegeReadKey, PrivilegeWriteKey, PrivilegeCreateIndexKey}, + AllowRestrictedIndices: false, + } + applicationPrivileges := map[string]interface{}{ + Application: Kibana, + Privileges: []string{PrivilegeReadKey, PrivilegeWriteKey}, + Resources: []string{Any}, + } + transientMetaPrivileges := map[string]interface{}{ + Enabled: true, + } + userRoleReqMap := map[string]interface{}{ + Cluster: []string{All}, + Indices: []map[string]interface{}{dbPrivileges}, + Applications: []map[string]interface{}{applicationPrivileges}, + RunAs: []string{}, + TransientMetadata: transientMetaPrivileges, + } + // fmt.Println(map1) + jsonStr, err := json.Marshal(userRoleReqMap) + if err != nil { + fmt.Printf("Error: %s", err.Error()) + return err + + } else { + fmt.Println(string(jsonStr)) + } + body := bytes.NewReader(jsonStr) + req := esapi.SecurityPutRoleRequest{ + Name: CustomUser, + Body: body, + } + + res, err := req.Do(ctx, es.client.Transport) + defer func(Body io.ReadCloser) { + err := Body.Close() + if err != nil { + klog.Errorf("failed to close response body from GetDBUser", err) + } + }(res.Body) + if err != nil { + fmt.Println("faced error while making request in ensuredbuserrole function") + return err + + } + + } + return nil +} diff --git a/elasticsearch/os_client_v1.go b/elasticsearch/os_client_v1.go index 221f78994..ed5831957 100644 --- a/elasticsearch/os_client_v1.go +++ b/elasticsearch/os_client_v1.go @@ -251,3 +251,7 @@ func (os *OSClientV1) GetTotalDiskUsage(ctx context.Context) (string, error) { func (os *OSClientV1) SyncCredentialFromSecret(secret *core.Secret) error { return nil } + +func (es *OSClientV1) EnsureDBUserRole(ctx context.Context) error { + return errors.New("not supported in os version 1") +} diff --git a/elasticsearch/os_client_v2.go b/elasticsearch/os_client_v2.go index 83ffa7e3b..f6f730951 100644 --- a/elasticsearch/os_client_v2.go +++ b/elasticsearch/os_client_v2.go @@ -250,3 +250,7 @@ func (os *OSClientV2) GetTotalDiskUsage(ctx context.Context) (string, error) { func (os *OSClientV2) SyncCredentialFromSecret(secret *core.Secret) error { return nil } + +func (es *OSClientV2) EnsureDBUserRole(ctx context.Context) error { + return errors.New("") +} From c22d57f782754bad21d18639bf002707fbfb6aa0 Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 11:22:27 +0600 Subject: [PATCH 02/24] Add methods to create and ensure db user role for elasticsearch Signed-off-by: Pritam --- elasticsearch/es_client_v7.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index 02285b3db..f8a624780 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -335,25 +335,25 @@ func (es *ESClientV7) EnsureDBUserRole(ctx context.Context) error { return err } if !flg { - elasticMap := map[string]interface{}{ + dbPrivileges := map[string]interface{}{ Names: []string{All}, Privileges: []string{PrivilegeReadKey, PrivilegeWriteKey, PrivilegeCreateIndexKey}, AllowRestrictedIndices: false, } - applicationMap := map[string]interface{}{ + applicationPrivileges := map[string]interface{}{ Application: Kibana, Privileges: []string{PrivilegeReadKey, PrivilegeWriteKey}, Resources: []string{Any}, } - transientMetaMap := map[string]interface{}{ + transientMetaPrivileges := map[string]interface{}{ Enabled: true, } userRoleReqMap := map[string]interface{}{ Cluster: []string{All}, - Indices: []map[string]interface{}{elasticMap}, - Applications: []map[string]interface{}{applicationMap}, + Indices: []map[string]interface{}{dbPrivileges}, + Applications: []map[string]interface{}{applicationPrivileges}, RunAs: []string{}, - TransientMetadata: transientMetaMap, + TransientMetadata: transientMetaPrivileges, } // fmt.Println(map1) jsonStr, err := json.Marshal(userRoleReqMap) From 7ca1f8544cba63465e635639e3599c6e611e56bf Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 11:35:55 +0600 Subject: [PATCH 03/24] Add methods to create and ensure db user role for elasticsearch Signed-off-by: Pritam --- elasticsearch/es_client_v7.go | 6 +++--- elasticsearch/es_client_v8.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index f8a624780..f7c0ad11d 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -356,15 +356,15 @@ func (es *ESClientV7) EnsureDBUserRole(ctx context.Context) error { TransientMetadata: transientMetaPrivileges, } // fmt.Println(map1) - jsonStr, err := json.Marshal(userRoleReqMap) + userRoleReqJSON, err := json.Marshal(userRoleReqMap) if err != nil { fmt.Printf("Error: %s", err.Error()) return err } else { - fmt.Println(string(jsonStr)) + fmt.Println(string(userRoleReqJSON)) } - body := bytes.NewReader(jsonStr) + body := bytes.NewReader(userRoleReqJSON) req := esapi.SecurityPutRoleRequest{ Name: CustomUser, Body: body, diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index a30e019de..a002c076e 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -355,15 +355,15 @@ func (es *ESClientV8) EnsureDBUserRole(ctx context.Context) error { TransientMetadata: transientMetaPrivileges, } // fmt.Println(map1) - jsonStr, err := json.Marshal(userRoleReqMap) + userRoleReqJSON, err := json.Marshal(userRoleReqMap) if err != nil { fmt.Printf("Error: %s", err.Error()) return err } else { - fmt.Println(string(jsonStr)) + fmt.Println(string(userRoleReqJSON)) } - body := bytes.NewReader(jsonStr) + body := bytes.NewReader(userRoleReqJSON) req := esapi.SecurityPutRoleRequest{ Name: CustomUser, Body: body, From cbc6b6df145bb7a1c6248ddb6098ea03376b7080 Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 11:37:56 +0600 Subject: [PATCH 04/24] Add methods to create and ensure db user role for elasticsearch Signed-off-by: Pritam --- elasticsearch/es_client_v7.go | 2 -- elasticsearch/es_client_v8.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index f7c0ad11d..0f0698dfe 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -314,8 +314,6 @@ func (es *ESClientV7) getDBUserRole(ctx context.Context) (error, bool) { klog.Errorf("failed to close response body from GetDBUser", err) } }(res.Body) - // bd, err := io.ReadAll(res.Body) - // fmt.Println("retrieved role------------------>", string(bd)) if err != nil { fmt.Println("faced error while making request in getdbuserrole function") diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index a002c076e..5ae98e7bf 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -313,8 +313,6 @@ func (es *ESClientV8) getDBUserRole(ctx context.Context) (error, bool) { klog.Errorf("failed to close response body from GetDBUser", err) } }(res.Body) - // bd, err := io.ReadAll(res.Body) - // fmt.Println("retrieved role------------------>", string(bd)) if err != nil { fmt.Println("faced error while making request in getdbuserrole function") From 7700fc27b246a6416a743ee956dc44fc9aa8fabe Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 11:41:14 +0600 Subject: [PATCH 05/24] Add methods to create and ensure db user role in elasticsearch Signed-off-by: Pritam --- elasticsearch/es_client_v7.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index 0f0698dfe..a2678a8fd 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -316,7 +316,7 @@ func (es *ESClientV7) getDBUserRole(ctx context.Context) (error, bool) { }(res.Body) if err != nil { - fmt.Println("faced error while making request in getdbuserrole function") + fmt.Println("faced error while making request in GetDBUserRole function") return err, false } if res.IsError() { @@ -376,7 +376,7 @@ func (es *ESClientV7) EnsureDBUserRole(ctx context.Context) error { } }(res.Body) if err != nil { - fmt.Println("faced error while making request in ensuredbuserrole function") + fmt.Println("faced error while making request in EnsureDBUserRole function") return err } From f18bd5a32d5930f6ad1074e823f147c5d802ae33 Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 11:47:51 +0600 Subject: [PATCH 06/24] Add methods to create and ensure db user role in elasticsearch Signed-off-by: Pritam --- elasticsearch/es_client_v7.go | 4 ++-- elasticsearch/es_client_v8.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index a2678a8fd..5a08982f5 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -311,7 +311,7 @@ func (es *ESClientV7) getDBUserRole(ctx context.Context) (error, bool) { defer func(Body io.ReadCloser) { err := Body.Close() if err != nil { - klog.Errorf("failed to close response body from GetDBUser", err) + klog.Errorf("failed to close response body from GetDBUserRole", err) } }(res.Body) @@ -372,7 +372,7 @@ func (es *ESClientV7) EnsureDBUserRole(ctx context.Context) error { defer func(Body io.ReadCloser) { err := Body.Close() if err != nil { - klog.Errorf("failed to close response body from GetDBUser", err) + klog.Errorf("failed to close response body from EnsureDBUserRole function", err) } }(res.Body) if err != nil { diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index 5ae98e7bf..3432117d1 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -310,12 +310,12 @@ func (es *ESClientV8) getDBUserRole(ctx context.Context) (error, bool) { defer func(Body io.ReadCloser) { err := Body.Close() if err != nil { - klog.Errorf("failed to close response body from GetDBUser", err) + klog.Errorf("failed to close response body from GetDBUserRole", err) } }(res.Body) if err != nil { - fmt.Println("faced error while making request in getdbuserrole function") + fmt.Println("faced error while making request in GetDBUserRole function") return err, false } if res.IsError() { @@ -371,11 +371,11 @@ func (es *ESClientV8) EnsureDBUserRole(ctx context.Context) error { defer func(Body io.ReadCloser) { err := Body.Close() if err != nil { - klog.Errorf("failed to close response body from GetDBUser", err) + klog.Errorf("failed to close response body from EnsureDBUserRole function", err) } }(res.Body) if err != nil { - fmt.Println("faced error while making request in ensuredbuserrole function") + fmt.Println("faced error while making request in EnsureDBUserRole function") return err } From b2b6e11b6d47eb91b4cac0e9629bf7ca7b146f04 Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 15:43:18 +0600 Subject: [PATCH 07/24] Changed function name and definition of interface. Signed-off-by: Pritam --- elasticsearch/api.go | 38 +++++++++----- elasticsearch/es_client_v5.go | 6 ++- elasticsearch/es_client_v6.go | 6 ++- elasticsearch/es_client_v7.go | 95 ++++++++++++++++------------------- elasticsearch/es_client_v8.go | 95 ++++++++++++++++------------------- elasticsearch/os_client_v1.go | 6 ++- elasticsearch/os_client_v2.go | 8 ++- 7 files changed, 135 insertions(+), 119 deletions(-) diff --git a/elasticsearch/api.go b/elasticsearch/api.go index b90077769..ca8e9cdd1 100644 --- a/elasticsearch/api.go +++ b/elasticsearch/api.go @@ -34,20 +34,33 @@ var ( PrivilegeCreateIndexKey = "create-index" Any = "*" All = "all" - Names = "names" - Privileges = "privileges" - AllowRestrictedIndices = "allow_restricted_indices" - Enabled = "enabled" - Cluster = "cluster" - Indices = "indices" - Applications = "applications" - Application = "application" - RunAs = "run_as" - TransientMetadata = "transient_metadata" - Resources = "resources" Kibana = "kibana-.kibana" ) +type DBPrivileges struct { + Names []string `json:"names"` + Privileges []string `json:"privileges"` + AllowRestrictedIndices bool `json:"allow_restricted_indices"` +} + +type ApplicationPrivileges struct { + Application string `json:"application"` + Privileges []string `json:"privileges"` + Resources []string `json:"resources"` +} + +type TransientMetaPrivileges struct { + Enabled bool `json:"enabled"` +} + +type UserRoleReq struct { + Cluster []string `json:"cluster"` + Indices []DBPrivileges `json:"indices"` + Applications []ApplicationPrivileges `json:"applications"` + RunAs []string `json:"run_as"` + TransientMetaData TransientMetaPrivileges `json:"transient_metadata"` +} + type WriteRequestIndex struct { Index WriteRequestIndexBody `json:"index"` } @@ -66,5 +79,6 @@ type ESClient interface { GetClusterWriteStatus(ctx context.Context, db *api.Elasticsearch) error GetClusterReadStatus(ctx context.Context, db *api.Elasticsearch) error GetTotalDiskUsage(ctx context.Context) (string, error) - EnsureDBUserRole(ctx context.Context) error + GetDBUserRole(ctx context.Context) (error, bool) + CreateDBUserRole(ctx context.Context) error } diff --git a/elasticsearch/es_client_v5.go b/elasticsearch/es_client_v5.go index 2dab7f87d..448748f3f 100644 --- a/elasticsearch/es_client_v5.go +++ b/elasticsearch/es_client_v5.go @@ -89,6 +89,10 @@ func (es *ESClientV5) GetTotalDiskUsage(ctx context.Context) (string, error) { return "", nil } -func (es *ESClientV5) EnsureDBUserRole(ctx context.Context) error { +func (es *ESClientV5) GetDBUserRole(ctx context.Context) (error, bool) { + return errors.New("not supported in es version 5"), false +} + +func (es *ESClientV5) CreateDBUserRole(ctx context.Context) error { return errors.New("not supported in es version 5") } diff --git a/elasticsearch/es_client_v6.go b/elasticsearch/es_client_v6.go index 76ba1c218..66ccf7191 100644 --- a/elasticsearch/es_client_v6.go +++ b/elasticsearch/es_client_v6.go @@ -213,6 +213,10 @@ func (es *ESClientV6) GetTotalDiskUsage(ctx context.Context) (string, error) { return "", nil } -func (es *ESClientV6) EnsureDBUserRole(ctx context.Context) error { +func (es *ESClientV6) GetDBUserRole(ctx context.Context) (error, bool) { + return errors.New("not supported in es version 6"), false +} + +func (es *ESClientV6) CreateDBUserRole(ctx context.Context) error { return errors.New("not supported in es version 6") } diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index 5a08982f5..617411870 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -303,7 +303,7 @@ func (es *ESClientV7) GetTotalDiskUsage(ctx context.Context) (string, error) { return totalDiskUsage, nil } -func (es *ESClientV7) getDBUserRole(ctx context.Context) (error, bool) { +func (es *ESClientV7) GetDBUserRole(ctx context.Context) (error, bool) { req := esapi.SecurityGetRoleRequest{ Name: []string{CustomUser}, } @@ -316,8 +316,8 @@ func (es *ESClientV7) getDBUserRole(ctx context.Context) (error, bool) { }(res.Body) if err != nil { - fmt.Println("faced error while making request in GetDBUserRole function") - return err, false + klog.Errorf("failed to get existing DB user role", err) + return nil, false } if res.IsError() { return err, false @@ -326,60 +326,53 @@ func (es *ESClientV7) getDBUserRole(ctx context.Context) (error, bool) { return nil, true } -func (es *ESClientV7) EnsureDBUserRole(ctx context.Context) error { - err, flg := es.getDBUserRole(ctx) +func (es *ESClientV7) CreateDBUserRole(ctx context.Context) error { + dbPrivileges := DBPrivileges{ + []string{All}, + []string{PrivilegeReadKey, PrivilegeWriteKey, PrivilegeCreateIndexKey}, + false, + } - if err != nil { - return err + applicationPrivileges := ApplicationPrivileges{ + Kibana, + []string{PrivilegeReadKey, PrivilegeWriteKey}, + []string{Any}, } - if !flg { - dbPrivileges := map[string]interface{}{ - Names: []string{All}, - Privileges: []string{PrivilegeReadKey, PrivilegeWriteKey, PrivilegeCreateIndexKey}, - AllowRestrictedIndices: false, - } - applicationPrivileges := map[string]interface{}{ - Application: Kibana, - Privileges: []string{PrivilegeReadKey, PrivilegeWriteKey}, - Resources: []string{Any}, - } - transientMetaPrivileges := map[string]interface{}{ - Enabled: true, - } - userRoleReqMap := map[string]interface{}{ - Cluster: []string{All}, - Indices: []map[string]interface{}{dbPrivileges}, - Applications: []map[string]interface{}{applicationPrivileges}, - RunAs: []string{}, - TransientMetadata: transientMetaPrivileges, - } - // fmt.Println(map1) - userRoleReqJSON, err := json.Marshal(userRoleReqMap) - if err != nil { - fmt.Printf("Error: %s", err.Error()) - return err - } else { - fmt.Println(string(userRoleReqJSON)) - } - body := bytes.NewReader(userRoleReqJSON) - req := esapi.SecurityPutRoleRequest{ - Name: CustomUser, - Body: body, - } + transientMetaPrivileges := TransientMetaPrivileges{ + true, + } - res, err := req.Do(ctx, es.client.Transport) - defer func(Body io.ReadCloser) { - err := Body.Close() - if err != nil { - klog.Errorf("failed to close response body from EnsureDBUserRole function", err) - } - }(res.Body) - if err != nil { - fmt.Println("faced error while making request in EnsureDBUserRole function") - return err + userRoleReqStruct := UserRoleReq{ + []string{All}, + []DBPrivileges{dbPrivileges}, + []ApplicationPrivileges{applicationPrivileges}, + []string{}, + transientMetaPrivileges, + } + + userRoleReqJSON, err := json.Marshal(userRoleReqStruct) + if err != nil { + fmt.Println(err) + } else { + fmt.Println("JSON form of roll", string(userRoleReqJSON)) + } + body := bytes.NewReader(userRoleReqJSON) + req := esapi.SecurityPutRoleRequest{ + Name: CustomUser, + Body: body, + } + res, err := req.Do(ctx, es.client.Transport) + defer func(Body io.ReadCloser) { + err := Body.Close() + if err != nil { + klog.Errorf("failed to close response body from EnsureDBUserRole function", err) } + }(res.Body) + if err != nil { + klog.Errorf("FAILED TO CREATE DATABASE USER ROLE", err) + return err } return nil diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index 3432117d1..aa186954c 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -302,7 +302,7 @@ func (es *ESClientV8) GetTotalDiskUsage(ctx context.Context) (string, error) { return totalDiskUsage, nil } -func (es *ESClientV8) getDBUserRole(ctx context.Context) (error, bool) { +func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { req := esapi.SecurityGetRoleRequest{ Name: []string{CustomUser}, } @@ -315,8 +315,8 @@ func (es *ESClientV8) getDBUserRole(ctx context.Context) (error, bool) { }(res.Body) if err != nil { - fmt.Println("faced error while making request in GetDBUserRole function") - return err, false + klog.Errorf("failed to get existing DB user role", err) + return nil, false } if res.IsError() { return err, false @@ -325,60 +325,53 @@ func (es *ESClientV8) getDBUserRole(ctx context.Context) (error, bool) { return nil, true } -func (es *ESClientV8) EnsureDBUserRole(ctx context.Context) error { - err, flg := es.getDBUserRole(ctx) +func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { + dbPrivileges := DBPrivileges{ + []string{All}, + []string{PrivilegeReadKey, PrivilegeWriteKey, PrivilegeCreateIndexKey}, + false, + } - if err != nil { - return err + applicationPrivileges := ApplicationPrivileges{ + Kibana, + []string{PrivilegeReadKey, PrivilegeWriteKey}, + []string{Any}, } - if !flg { - dbPrivileges := map[string]interface{}{ - Names: []string{All}, - Privileges: []string{PrivilegeReadKey, PrivilegeWriteKey, PrivilegeCreateIndexKey}, - AllowRestrictedIndices: false, - } - applicationPrivileges := map[string]interface{}{ - Application: Kibana, - Privileges: []string{PrivilegeReadKey, PrivilegeWriteKey}, - Resources: []string{Any}, - } - transientMetaPrivileges := map[string]interface{}{ - Enabled: true, - } - userRoleReqMap := map[string]interface{}{ - Cluster: []string{All}, - Indices: []map[string]interface{}{dbPrivileges}, - Applications: []map[string]interface{}{applicationPrivileges}, - RunAs: []string{}, - TransientMetadata: transientMetaPrivileges, - } - // fmt.Println(map1) - userRoleReqJSON, err := json.Marshal(userRoleReqMap) - if err != nil { - fmt.Printf("Error: %s", err.Error()) - return err - } else { - fmt.Println(string(userRoleReqJSON)) - } - body := bytes.NewReader(userRoleReqJSON) - req := esapi.SecurityPutRoleRequest{ - Name: CustomUser, - Body: body, - } + transientMetaPrivileges := TransientMetaPrivileges{ + true, + } - res, err := req.Do(ctx, es.client.Transport) - defer func(Body io.ReadCloser) { - err := Body.Close() - if err != nil { - klog.Errorf("failed to close response body from EnsureDBUserRole function", err) - } - }(res.Body) - if err != nil { - fmt.Println("faced error while making request in EnsureDBUserRole function") - return err + userRoleReqStruct := UserRoleReq{ + []string{All}, + []DBPrivileges{dbPrivileges}, + []ApplicationPrivileges{applicationPrivileges}, + []string{}, + transientMetaPrivileges, + } + + userRoleReqJSON, err := json.Marshal(userRoleReqStruct) + if err != nil { + fmt.Println(err) + } else { + fmt.Println("JSON form of roll", string(userRoleReqJSON)) + } + body := bytes.NewReader(userRoleReqJSON) + req := esapi.SecurityPutRoleRequest{ + Name: CustomUser, + Body: body, + } + res, err := req.Do(ctx, es.client.Transport) + defer func(Body io.ReadCloser) { + err := Body.Close() + if err != nil { + klog.Errorf("failed to close response body from EnsureDBUserRole function", err) } + }(res.Body) + if err != nil { + klog.Errorf("FAILED TO CREATE DATABASE USER ROLE", err) + return err } return nil diff --git a/elasticsearch/os_client_v1.go b/elasticsearch/os_client_v1.go index ed5831957..9ffefbe45 100644 --- a/elasticsearch/os_client_v1.go +++ b/elasticsearch/os_client_v1.go @@ -252,6 +252,10 @@ func (os *OSClientV1) SyncCredentialFromSecret(secret *core.Secret) error { return nil } -func (es *OSClientV1) EnsureDBUserRole(ctx context.Context) error { +func (os *OSClientV1) GetDBUserRole(ctx context.Context) (error, bool) { + return errors.New("not supported in os version 1"), false +} + +func (os *OSClientV1) CreateDBUserRole(ctx context.Context) error { return errors.New("not supported in os version 1") } diff --git a/elasticsearch/os_client_v2.go b/elasticsearch/os_client_v2.go index f6f730951..886f1ba95 100644 --- a/elasticsearch/os_client_v2.go +++ b/elasticsearch/os_client_v2.go @@ -251,6 +251,10 @@ func (os *OSClientV2) SyncCredentialFromSecret(secret *core.Secret) error { return nil } -func (es *OSClientV2) EnsureDBUserRole(ctx context.Context) error { - return errors.New("") +func (os *OSClientV2) GetDBUserRole(ctx context.Context) (error, bool) { + return errors.New("not supported in os version 2"), false +} + +func (os *OSClientV2) CreateDBUserRole(ctx context.Context) error { + return errors.New("not supported in os version 2") } From 9e3fe663bb822e5bc37d5cc1de99131460666503 Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 16:01:35 +0600 Subject: [PATCH 08/24] Trying to get role which was supposed to be created Signed-off-by: Pritam --- elasticsearch/es_client_v8.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index aa186954c..3f0f0d224 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -372,7 +372,7 @@ func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { if err != nil { klog.Errorf("FAILED TO CREATE DATABASE USER ROLE", err) return err - } + fmt.Println("our role ", res.Body) return nil } From 3737811ee2718bcc7eae222071db236095936663 Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 16:10:00 +0600 Subject: [PATCH 09/24] fixed create-index spelling Signed-off-by: Pritam --- elasticsearch/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/api.go b/elasticsearch/api.go index ca8e9cdd1..162a4020c 100644 --- a/elasticsearch/api.go +++ b/elasticsearch/api.go @@ -31,7 +31,7 @@ var ( CustomUser = "custom-user" PrivilegeReadKey = "read" PrivilegeWriteKey = "write" - PrivilegeCreateIndexKey = "create-index" + PrivilegeCreateIndexKey = "create_index" Any = "*" All = "all" Kibana = "kibana-.kibana" From 368689cac9f0d841fe89df77fa9bbbaf841a67f6 Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 16:17:28 +0600 Subject: [PATCH 10/24] Updated custom-=user spelling Signed-off-by: Pritam --- elasticsearch/api.go | 2 +- elasticsearch/es_client_v8.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/elasticsearch/api.go b/elasticsearch/api.go index 162a4020c..8658b1e88 100644 --- a/elasticsearch/api.go +++ b/elasticsearch/api.go @@ -28,7 +28,7 @@ var ( writeRequestIndex = "kubedb-system" writeRequestID = "info" writeRequestType = "_doc" - CustomUser = "custom-user" + CustomUser = "custom_user" PrivilegeReadKey = "read" PrivilegeWriteKey = "write" PrivilegeCreateIndexKey = "create_index" diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index 3f0f0d224..35e572c9a 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -327,7 +327,7 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { dbPrivileges := DBPrivileges{ - []string{All}, + []string{Any}, []string{PrivilegeReadKey, PrivilegeWriteKey, PrivilegeCreateIndexKey}, false, } From 6b39463d519c199692c3a03ca6361162f848a52d Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 17:01:49 +0600 Subject: [PATCH 11/24] Performed necessary changes in methonds. Signed-off-by: Pritam --- elasticsearch/api.go | 31 +++++++++--------- elasticsearch/es_client_v7.go | 58 +++++++++++++++++---------------- elasticsearch/es_client_v8.go | 60 +++++++++++++++++++---------------- 3 files changed, 78 insertions(+), 71 deletions(-) diff --git a/elasticsearch/api.go b/elasticsearch/api.go index 8658b1e88..804dbce60 100644 --- a/elasticsearch/api.go +++ b/elasticsearch/api.go @@ -18,23 +18,22 @@ package elasticsearch import ( "context" + core "k8s.io/api/core/v1" api "kubedb.dev/apimachinery/apis/kubedb/v1alpha2" - - core "k8s.io/api/core/v1" ) var ( - writeRequestIndex = "kubedb-system" - writeRequestID = "info" - writeRequestType = "_doc" - CustomUser = "custom_user" - PrivilegeReadKey = "read" - PrivilegeWriteKey = "write" - PrivilegeCreateIndexKey = "create_index" - Any = "*" - All = "all" - Kibana = "kibana-.kibana" + writeRequestIndex = "kubedb-system" + writeRequestID = "info" + writeRequestType = "_doc" + CustomUserName = "custom_user" + PrivilegeRead = "read" + PrivilegeWrite = "write" + PrivilegeCreateIndex = "create_index" + PrivilegeIndexAny = "*" + ClusterAccessAll = "all" + ApplicationKibana = "kibana-.kibana" ) type DBPrivileges struct { @@ -72,13 +71,13 @@ type WriteRequestIndexBody struct { type ESClient interface { ClusterHealthInfo() (map[string]interface{}, error) - NodesStats() (map[string]interface{}, error) - GetIndicesInfo() ([]interface{}, error) + CreateDBUserRole(ctx context.Context) error ClusterStatus() (string, error) - SyncCredentialFromSecret(secret *core.Secret) error + GetIndicesInfo() ([]interface{}, error) GetClusterWriteStatus(ctx context.Context, db *api.Elasticsearch) error GetClusterReadStatus(ctx context.Context, db *api.Elasticsearch) error GetTotalDiskUsage(ctx context.Context) (string, error) GetDBUserRole(ctx context.Context) (error, bool) - CreateDBUserRole(ctx context.Context) error + NodesStats() (map[string]interface{}, error) + SyncCredentialFromSecret(secret *core.Secret) error } diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index 617411870..7213cd199 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -305,7 +305,7 @@ func (es *ESClientV7) GetTotalDiskUsage(ctx context.Context) (string, error) { func (es *ESClientV7) GetDBUserRole(ctx context.Context) (error, bool) { req := esapi.SecurityGetRoleRequest{ - Name: []string{CustomUser}, + Name: []string{CustomUserName}, } res, err := req.Do(ctx, es.client.Transport) defer func(Body io.ReadCloser) { @@ -317,9 +317,11 @@ func (es *ESClientV7) GetDBUserRole(ctx context.Context) (error, bool) { if err != nil { klog.Errorf("failed to get existing DB user role", err) - return nil, false + return err, false } if res.IsError() { + err = errors.New(fmt.Sprintf("fetching DB user role failed with error status code %d", res.StatusCode)) + klog.Errorf("Failed to fetch DB user role", err) return err, false } @@ -327,39 +329,36 @@ func (es *ESClientV7) GetDBUserRole(ctx context.Context) (error, bool) { } func (es *ESClientV7) CreateDBUserRole(ctx context.Context) error { - dbPrivileges := DBPrivileges{ - []string{All}, - []string{PrivilegeReadKey, PrivilegeWriteKey, PrivilegeCreateIndexKey}, - false, - } - - applicationPrivileges := ApplicationPrivileges{ - Kibana, - []string{PrivilegeReadKey, PrivilegeWriteKey}, - []string{Any}, - } - - transientMetaPrivileges := TransientMetaPrivileges{ - true, - } - userRoleReqStruct := UserRoleReq{ - []string{All}, - []DBPrivileges{dbPrivileges}, - []ApplicationPrivileges{applicationPrivileges}, + []string{ClusterAccessAll}, + []DBPrivileges{ + { + []string{PrivilegeIndexAny}, + []string{PrivilegeRead, PrivilegeWrite, PrivilegeCreateIndex}, + false, + }, + }, + []ApplicationPrivileges{ + { + ApplicationKibana, + []string{PrivilegeRead, PrivilegeWrite}, + []string{PrivilegeIndexAny}, + }, + }, []string{}, - transientMetaPrivileges, + TransientMetaPrivileges{ + true, + }, } userRoleReqJSON, err := json.Marshal(userRoleReqStruct) if err != nil { - fmt.Println(err) - } else { - fmt.Println("JSON form of roll", string(userRoleReqJSON)) + klog.Errorf("Failed to parse rollRequest body to JSOn", err) + return err } body := bytes.NewReader(userRoleReqJSON) req := esapi.SecurityPutRoleRequest{ - Name: CustomUser, + Name: CustomUserName, Body: body, } @@ -371,9 +370,14 @@ func (es *ESClientV7) CreateDBUserRole(ctx context.Context) error { } }(res.Body) if err != nil { - klog.Errorf("FAILED TO CREATE DATABASE USER ROLE", err) + klog.Errorf("Failed to perform request to create DB user role", err) return err + } + if res.IsError() { + err = errors.New(fmt.Sprintf("DB user role creation failed with error status code %d", res.StatusCode)) + klog.Errorf("Failed to create DB user role", err) + return err } return nil } diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index 35e572c9a..48a037f81 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -304,7 +304,7 @@ func (es *ESClientV8) GetTotalDiskUsage(ctx context.Context) (string, error) { func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { req := esapi.SecurityGetRoleRequest{ - Name: []string{CustomUser}, + Name: []string{CustomUserName}, } res, err := req.Do(ctx, es.client.Transport) defer func(Body io.ReadCloser) { @@ -316,9 +316,11 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { if err != nil { klog.Errorf("failed to get existing DB user role", err) - return nil, false + return err, false } if res.IsError() { + err = errors.New(fmt.Sprintf("fetching DB user role failed with error status code %d", res.StatusCode)) + klog.Errorf("Failed to fetch DB user role", err) return err, false } @@ -326,39 +328,36 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { } func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { - dbPrivileges := DBPrivileges{ - []string{Any}, - []string{PrivilegeReadKey, PrivilegeWriteKey, PrivilegeCreateIndexKey}, - false, - } - - applicationPrivileges := ApplicationPrivileges{ - Kibana, - []string{PrivilegeReadKey, PrivilegeWriteKey}, - []string{Any}, - } - - transientMetaPrivileges := TransientMetaPrivileges{ - true, - } - userRoleReqStruct := UserRoleReq{ - []string{All}, - []DBPrivileges{dbPrivileges}, - []ApplicationPrivileges{applicationPrivileges}, + []string{ClusterAccessAll}, + []DBPrivileges{ + { + []string{PrivilegeIndexAny}, + []string{PrivilegeRead, PrivilegeWrite, PrivilegeCreateIndex}, + false, + }, + }, + []ApplicationPrivileges{ + { + ApplicationKibana, + []string{PrivilegeRead, PrivilegeWrite}, + []string{PrivilegeIndexAny}, + }, + }, []string{}, - transientMetaPrivileges, + TransientMetaPrivileges{ + true, + }, } userRoleReqJSON, err := json.Marshal(userRoleReqStruct) if err != nil { - fmt.Println(err) - } else { - fmt.Println("JSON form of roll", string(userRoleReqJSON)) + klog.Errorf("Failed to parse rollRequest body to JSOn", err) + return err } body := bytes.NewReader(userRoleReqJSON) req := esapi.SecurityPutRoleRequest{ - Name: CustomUser, + Name: CustomUserName, Body: body, } @@ -370,9 +369,14 @@ func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { } }(res.Body) if err != nil { - klog.Errorf("FAILED TO CREATE DATABASE USER ROLE", err) + klog.Errorf("Failed to perform request to create DB user role", err) + return err + } + + if res.IsError() { + err = errors.New(fmt.Sprintf("DB user role creation failed with error status code %d", res.StatusCode)) + klog.Errorf("Failed to create DB user role", err) return err } - fmt.Println("our role ", res.Body) return nil } From 8881199edd47aaa860c07f9ecd531b24d30807b7 Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 17:13:59 +0600 Subject: [PATCH 12/24] Can't return error if role doesn't exist. Signed-off-by: Pritam --- elasticsearch/es_client_v7.go | 2 +- elasticsearch/es_client_v8.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index 7213cd199..d6c6fd02c 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -322,7 +322,7 @@ func (es *ESClientV7) GetDBUserRole(ctx context.Context) (error, bool) { if res.IsError() { err = errors.New(fmt.Sprintf("fetching DB user role failed with error status code %d", res.StatusCode)) klog.Errorf("Failed to fetch DB user role", err) - return err, false + return nil, false } return nil, true diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index 48a037f81..1df663007 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -321,7 +321,7 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { if res.IsError() { err = errors.New(fmt.Sprintf("fetching DB user role failed with error status code %d", res.StatusCode)) klog.Errorf("Failed to fetch DB user role", err) - return err, false + return nil, false } return nil, true From af87662520d0d6ecd645d7c3fc93d5affd495541 Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 17:35:21 +0600 Subject: [PATCH 13/24] Applied make gen fmt. Signed-off-by: Pritam --- elasticsearch/api.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/elasticsearch/api.go b/elasticsearch/api.go index 804dbce60..e047d11b5 100644 --- a/elasticsearch/api.go +++ b/elasticsearch/api.go @@ -18,9 +18,10 @@ package elasticsearch import ( "context" - core "k8s.io/api/core/v1" api "kubedb.dev/apimachinery/apis/kubedb/v1alpha2" + + core "k8s.io/api/core/v1" ) var ( From 60446dacb92619a703a6483d4084bfca3b7dad1a Mon Sep 17 00:00:00 2001 From: Pritam Date: Mon, 24 Jul 2023 18:47:34 +0600 Subject: [PATCH 14/24] Updated version of api-machinary. Signed-off-by: Pritam --- go.mod | 4 +- go.sum | 8 +- vendor/kmodules.xyz/client-go/Makefile | 2 +- .../client-go/api/v1/conditions.go | 216 +++---------- .../client-go/api/v1/generated.pb.go | 300 ++++++++++-------- .../client-go/api/v1/generated.proto | 35 +- .../client-go/api/v1/openapi_generated.go | 22 +- .../client-go/api/v1/zz_generated.deepcopy.go | 22 ++ .../client-go/apiextensions/kubernetes.go | 2 +- .../catalog/v1alpha1/openapi_generated.go | 22 +- .../dashboard/v1alpha1/openapi_generated.go | 22 +- .../apis/kubedb/v1alpha2/constants.go | 27 +- .../kubedb/v1alpha2/elasticsearch_helpers.go | 4 + .../apis/kubedb/v1alpha2/etcd_helpers.go | 5 + .../apis/kubedb/v1alpha2/kafka_helpers.go | 4 + .../apis/kubedb/v1alpha2/kafka_types.go | 5 + .../apis/kubedb/v1alpha2/mariadb_helpers.go | 4 + .../apis/kubedb/v1alpha2/memcached_helpers.go | 5 + .../apis/kubedb/v1alpha2/mongodb_helpers.go | 4 + .../apis/kubedb/v1alpha2/mysql_helpers.go | 4 + .../apis/kubedb/v1alpha2/openapi_generated.go | 30 +- .../kubedb/v1alpha2/perconaxtradb_helpers.go | 4 + .../apis/kubedb/v1alpha2/pgbouncer_helpers.go | 5 + .../apis/kubedb/v1alpha2/postgres_helpers.go | 4 + .../apis/kubedb/v1alpha2/proxysql_helpers.go | 5 + .../apis/kubedb/v1alpha2/redis_helpers.go | 4 + .../kubedb/v1alpha2/redis_sentinel_helpers.go | 4 + .../kubedb/v1alpha2/zz_generated.deepcopy.go | 5 + ...g.kubedb.com_elasticsearchautoscalers.yaml | 4 +- ...utoscaling.kubedb.com_etcdautoscalers.yaml | 4 +- ...scaling.kubedb.com_mariadbautoscalers.yaml | 4 +- ...aling.kubedb.com_memcachedautoscalers.yaml | 4 +- ...scaling.kubedb.com_mongodbautoscalers.yaml | 4 +- ...toscaling.kubedb.com_mysqlautoscalers.yaml | 4 +- ...g.kubedb.com_perconaxtradbautoscalers.yaml | 4 +- ...aling.kubedb.com_pgbouncerautoscalers.yaml | 4 +- ...caling.kubedb.com_postgresautoscalers.yaml | 4 +- ...caling.kubedb.com_proxysqlautoscalers.yaml | 4 +- ...toscaling.kubedb.com_redisautoscalers.yaml | 4 +- ...g.kubedb.com_redissentinelautoscalers.yaml | 4 +- ...rd.kubedb.com_elasticsearchdashboards.yaml | 4 +- .../crds/kubedb.com_elasticsearches.yaml | 4 +- .../apimachinery/crds/kubedb.com_etcds.yaml | 4 +- .../apimachinery/crds/kubedb.com_kafkas.yaml | 10 +- .../crds/kubedb.com_mariadbs.yaml | 4 +- .../crds/kubedb.com_memcacheds.yaml | 4 +- .../crds/kubedb.com_mongodbs.yaml | 4 +- .../apimachinery/crds/kubedb.com_mysqls.yaml | 4 +- .../crds/kubedb.com_perconaxtradbs.yaml | 4 +- .../crds/kubedb.com_pgbouncers.yaml | 4 +- .../crds/kubedb.com_postgreses.yaml | 4 +- .../crds/kubedb.com_proxysqls.yaml | 4 +- .../apimachinery/crds/kubedb.com_redises.yaml | 4 +- .../crds/kubedb.com_redissentinels.yaml | 4 +- ...s.kubedb.com_elasticsearchopsrequests.yaml | 4 +- .../crds/ops.kubedb.com_etcdopsrequests.yaml | 4 +- .../ops.kubedb.com_mariadbopsrequests.yaml | 4 +- .../ops.kubedb.com_memcachedopsrequests.yaml | 4 +- .../ops.kubedb.com_mongodbopsrequests.yaml | 4 +- .../crds/ops.kubedb.com_mysqlopsrequests.yaml | 4 +- ...s.kubedb.com_perconaxtradbopsrequests.yaml | 4 +- .../ops.kubedb.com_pgbounceropsrequests.yaml | 4 +- .../ops.kubedb.com_postgresopsrequests.yaml | 4 +- .../ops.kubedb.com_proxysqlopsrequests.yaml | 4 +- .../crds/ops.kubedb.com_redisopsrequests.yaml | 4 +- ...s.kubedb.com_redissentinelopsrequests.yaml | 4 +- .../crds/postgres.kubedb.com_publishers.yaml | 4 +- .../crds/postgres.kubedb.com_subscribers.yaml | 4 +- .../schema.kubedb.com_mariadbdatabases.yaml | 4 +- .../schema.kubedb.com_mongodbdatabases.yaml | 4 +- .../schema.kubedb.com_mysqldatabases.yaml | 4 +- .../schema.kubedb.com_postgresdatabases.yaml | 4 +- .../ui.kubedb.com_elasticsearchinsights.yaml | 4 +- .../crds/ui.kubedb.com_mariadbinsights.yaml | 4 +- .../crds/ui.kubedb.com_mongodbinsights.yaml | 4 +- .../crds/ui.kubedb.com_mysqlinsights.yaml | 4 +- .../crds/ui.kubedb.com_pgbouncerinsights.yaml | 4 +- .../crds/ui.kubedb.com_postgresinsights.yaml | 4 +- .../crds/ui.kubedb.com_proxysqlinsights.yaml | 4 +- .../crds/ui.kubedb.com_redisinsights.yaml | 4 +- vendor/modules.txt | 4 +- 81 files changed, 527 insertions(+), 469 deletions(-) diff --git a/go.mod b/go.mod index d496ce517..ae7336c9b 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,8 @@ require ( go.mongodb.org/mongo-driver v1.10.2 k8s.io/api v0.25.3 k8s.io/klog/v2 v2.80.1 - kmodules.xyz/client-go v0.25.23 - kubedb.dev/apimachinery v0.33.2-0.20230613082109-19397df99ef7 + kmodules.xyz/client-go v0.25.27 + kubedb.dev/apimachinery v0.34.1-0.20230724122802-eb1b7f2152cc sigs.k8s.io/controller-runtime v0.13.1 xorm.io/xorm v1.3.2 ) diff --git a/go.sum b/go.sum index 416406ec5..9d3a3380e 100644 --- a/go.sum +++ b/go.sum @@ -1486,16 +1486,16 @@ k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20221012122500-cfd413dd9e85 h1:cTdVh7LYu82xeClmfzGtgyspNh6UxpwLWGi8R4sspNo= k8s.io/utils v0.0.0-20221012122500-cfd413dd9e85/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -kmodules.xyz/client-go v0.25.23 h1:qz5XJYHLVZUowqfRXEJD7JQ4iaLLzQ1O1zPMmsdrkJw= -kmodules.xyz/client-go v0.25.23/go.mod h1:wbdzLEoDYiCPI6dTW0mIAGNwkwFV4lC5BN1FJxiDsbw= +kmodules.xyz/client-go v0.25.27 h1:Ivl054xbXSvMNMKAJtK7TkS0iZX0AHvVQzxtsrIk9ik= +kmodules.xyz/client-go v0.25.27/go.mod h1:PYfJtJs+AhgfkJNIeUObU4SqAkY85ARTlXxC+2gAsgo= kmodules.xyz/custom-resources v0.25.2 h1:+PJgUZvbbSgyNT7EX9gUZ3PIzY2LAW03TDW8cevvXqo= kmodules.xyz/custom-resources v0.25.2/go.mod h1:b9XjjKQMZ6KrLHXKqQz7YwV3M3BK8Hwi4KEwu5RadCo= kmodules.xyz/monitoring-agent-api v0.25.1 h1:E1H8U/vMfYQ8wevmJv6Lcj0Z4DF7cH3hZ2xkFgG+xKk= kmodules.xyz/monitoring-agent-api v0.25.1/go.mod h1:IphGzRWbuV00B3TLalcBs6+IlchSZVTwKDty+J3LLz4= kmodules.xyz/offshoot-api v0.25.4 h1:IjJNvkphcdYUG8XO/pBwXpuP8W+jxAWJZ3yH8vgI/as= kmodules.xyz/offshoot-api v0.25.4/go.mod h1:PUk4EuJFhhyQykCflHj7EgXcljGIqs9vi0IN0RpxtY4= -kubedb.dev/apimachinery v0.33.2-0.20230613082109-19397df99ef7 h1:uxx+5CIZWBckBql9Vb3E87qXudgQBxgkfbBkL7nBgvA= -kubedb.dev/apimachinery v0.33.2-0.20230613082109-19397df99ef7/go.mod h1:bFkJ6mbKUpmvmfVML6dczw/+BEO8AMKcuWZckydR2Y0= +kubedb.dev/apimachinery v0.34.1-0.20230724122802-eb1b7f2152cc h1:pwUjqKeog1LH/SjbrsU05Hqe4EWd5UcCNRS/yE+hXbU= +kubedb.dev/apimachinery v0.34.1-0.20230724122802-eb1b7f2152cc/go.mod h1:K4tmJODPLOBgYGA/4N8Cx4ZwX1ZtZF8E+O1NIRWwyzA= lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= diff --git a/vendor/kmodules.xyz/client-go/Makefile b/vendor/kmodules.xyz/client-go/Makefile index 441dd38e2..1a350d7af 100644 --- a/vendor/kmodules.xyz/client-go/Makefile +++ b/vendor/kmodules.xyz/client-go/Makefile @@ -45,7 +45,7 @@ endif ### These variables should not need tweaking. ### -SRC_PKGS := admissionregistration api apiextensions apiregistration apps batch certificates client core discovery dynamic extensions meta networking openapi policy rbac storage tools +SRC_PKGS := admissionregistration api apiextensions apiregistration apps batch certificates client conditions core discovery dynamic extensions meta networking openapi policy rbac storage tools SRC_DIRS := $(SRC_PKGS) *.go DOCKER_PLATFORMS := linux/amd64 linux/arm linux/arm64 diff --git a/vendor/kmodules.xyz/client-go/api/v1/conditions.go b/vendor/kmodules.xyz/client-go/api/v1/conditions.go index 332a460c6..148531c82 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/conditions.go +++ b/vendor/kmodules.xyz/client-go/api/v1/conditions.go @@ -1,5 +1,5 @@ /* -Copyright AppsCode Inc. and Contributors +Copyright 2020 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,190 +17,72 @@ limitations under the License. package v1 import ( - "fmt" - - core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// KEP: https://github.com/kubernetes/enhancements/blob/ced773ab59f0ff080888a912ab99474245623dad/keps/sig-api-machinery/1623-standardize-conditions/README.md +// ConditionSeverity expresses the severity of a Condition Type failing. +type ConditionSeverity string -// List of common condition types const ( - ConditionProgressing = "Progressing" - ConditionInitialized = "Initialized" - ConditionReady = "Ready" - ConditionAvailable = "Available" - ConditionFailed = "Failed" - - ConditionRequestApproved = "Approved" - ConditionRequestDenied = "Denied" + // ConditionSeverityError specifies that a condition with `Status=False` is an error. + ConditionSeverityError ConditionSeverity = "Error" + + // ConditionSeverityWarning specifies that a condition with `Status=False` is a warning. + ConditionSeverityWarning ConditionSeverity = "Warning" + + // ConditionSeverityInfo specifies that a condition with `Status=False` is informative. + ConditionSeverityInfo ConditionSeverity = "Info" + + // ConditionSeverityNone should apply only to util with `Status=True`. + ConditionSeverityNone ConditionSeverity = "" ) +// ConditionType is a valid value for Condition.Type. +type ConditionType string + +const ( + // ReadyCondition defines the Ready condition type that summarizes the operational state of an object. + ReadyCondition ConditionType = "Ready" +) + +// Condition defines an observation of a object operational state. type Condition struct { // Type of condition in CamelCase or in foo.example.com/CamelCase. - // Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - // useful (see .node.status.conditions), the ability to deconflict is important. - // +required - Type string `json:"type" protobuf:"bytes,1,opt,name=type"` + // Many .condition.type values are consistent across resources like Available, but because arbitrary util + // can be useful (see .node.status.util), the ability to deconflict is important. + Type ConditionType `json:"type" protobuf:"bytes,4,opt,name=type,casttype=ConditionType"` + // Status of the condition, one of True, False, Unknown. - // +required - Status core.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/api/core/v1.ConditionStatus"` + Status metav1.ConditionStatus `json:"status" protobuf:"bytes,5,opt,name=status,casttype=k8s.io/api/core/v1.ConditionStatus"` + // If set, this represents the .metadata.generation that the condition was set based upon. // For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date // with respect to the current state of the instance. // +optional ObservedGeneration int64 `json:"observedGeneration,omitempty" protobuf:"varint,3,opt,name=observedGeneration"` - // Last time the condition transitioned from one status to another. - // This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - // +required - LastTransitionTime metav1.Time `json:"lastTransitionTime" protobuf:"bytes,4,opt,name=lastTransitionTime"` - // The reason for the condition's last transition in CamelCase. - // The specific API may choose whether or not this field is considered a guaranteed API. - // This field may not be empty. - // +required - Reason string `json:"reason" protobuf:"bytes,5,opt,name=reason"` - // A human readable message indicating details about the transition. - // This field may be empty. - // +required - Message string `json:"message" protobuf:"bytes,6,opt,name=message"` -} - -func NewCondition(reason string, message string, generation int64, conditionStatus ...bool) Condition { - cs := core.ConditionTrue - if len(conditionStatus) > 0 && !conditionStatus[0] { - cs = core.ConditionFalse - } - - return Condition{ - Type: reason, - Reason: reason, - Message: message, - Status: cs, - LastTransitionTime: metav1.Now(), - ObservedGeneration: generation, - } -} - -// HasCondition returns "true" if the desired condition provided in "condType" is present in the condition list. -// Otherwise, it returns "false". -func HasCondition(conditions []Condition, condType string) bool { - for i := range conditions { - if conditions[i].Type == condType { - return true - } - } - return false -} - -// GetCondition returns a pointer to the desired condition referred by "condType". Otherwise, it returns nil. -func GetCondition(conditions []Condition, condType string) (int, *Condition) { - for i := range conditions { - c := conditions[i] - if c.Type == condType { - return i, &c - } - } - return -1, nil -} -// SetCondition add/update the desired condition to the condition list. It does nothing if the condition is already in -// its desired state. -func SetCondition(conditions []Condition, newCondition Condition) []Condition { - idx, curCond := GetCondition(conditions, newCondition.Type) - // If the current condition is in its desired state, we have nothing to do. Just return the original condition list. - if curCond != nil && - curCond.Status == newCondition.Status && - curCond.Reason == newCondition.Reason && - curCond.Message == newCondition.Message && - curCond.ObservedGeneration == newCondition.ObservedGeneration { - return conditions - } - // The desired conditions is not in the condition list or is not in its desired state. - // Update it if present in the condition list, or append the new condition if it does not present. - newCondition.LastTransitionTime = metav1.Now() - if idx == -1 { - conditions = append(conditions, newCondition) - } else if newCondition.ObservedGeneration >= curCond.ObservedGeneration { - // only update if the new condition is based on observed generation at least as updated as the current condition - conditions[idx] = newCondition - } - return conditions -} - -// RemoveCondition remove a condition from the condition list referred by "condType" parameter. -func RemoveCondition(conditions []Condition, condType string) []Condition { - idx, _ := GetCondition(conditions, condType) - if idx == -1 { - // The desired condition is not present in the condition list. So, nothing to do. - return conditions - } - return append(conditions[:idx], conditions[idx+1:]...) -} - -// IsConditionTrue returns "true" if the desired condition is in true state. -// It returns "false" if the desired condition is not in "true" state or is not in the condition list. -func IsConditionTrue(conditions []Condition, condType string) bool { - for i := range conditions { - if conditions[i].Type == condType && conditions[i].Status == core.ConditionTrue { - return true - } - } - return false -} - -// IsConditionFalse returns "true" if the desired condition is in false state. -// It returns "false" if the desired condition is not in "false" state or is not in the condition list. -func IsConditionFalse(conditions []Condition, condType string) bool { - for i := range conditions { - if conditions[i].Type == condType && conditions[i].Status == core.ConditionFalse { - return true - } - } - return false -} - -// IsConditionUnknown returns "true" if the desired condition is in unknown state. -// It returns "false" if the desired condition is not in "unknown" state or is not in the condition list. -func IsConditionUnknown(conditions []Condition, condType string) bool { - for i := range conditions { - if conditions[i].Type == condType && conditions[i].Status == core.ConditionUnknown { - return true - } - } - return false -} - -// Status defines the set of statuses a resource can have. -// Based on kstatus: https://github.com/kubernetes-sigs/cli-utils/tree/master/pkg/kstatus -// +kubebuilder:validation:Enum=InProgress;Failed;Current;Terminating;NotFound;Unknown -type Status string + // Severity provides an explicit classification of Reason code, so the users or machines can immediately + // understand the current situation and act accordingly. + // The Severity field MUST be set only when Status=False. + // +optional + Severity ConditionSeverity `json:"severity,omitempty" protobuf:"bytes,6,opt,name=severity,casttype=ConditionSeverity"` -const ( - // The set of status conditions which can be assigned to resources. - InProgressStatus Status = "InProgress" - FailedStatus Status = "Failed" - CurrentStatus Status = "Current" - TerminatingStatus Status = "Terminating" - NotFoundStatus Status = "NotFound" - UnknownStatus Status = "Unknown" -) + // Last time the condition transitioned from one status to another. + // This should be when the underlying condition changed. If that is not known, then using the time when + // the API field changed is acceptable. + LastTransitionTime metav1.Time `json:"lastTransitionTime" protobuf:"bytes,7,opt,name=lastTransitionTime"` -var Statuses = []Status{InProgressStatus, FailedStatus, CurrentStatus, TerminatingStatus, UnknownStatus} + // The reason for the condition's last transition in CamelCase. + // The specific API may choose whether this field is considered a guaranteed API. + // This field may not be empty. + // +optional + Reason string `json:"reason,omitempty" protobuf:"bytes,8,opt,name=reason"` -// String returns the status as a string. -func (s Status) String() string { - return string(s) + // A human-readable message indicating details about the transition. + // This field may be empty. + // +optional + Message string `json:"message,omitempty" protobuf:"bytes,9,opt,name=message"` } -// StatusFromStringOrDie turns a string into a Status. Will panic if the provided string is -// not a valid status. -func StatusFromStringOrDie(text string) Status { - s := Status(text) - for _, r := range Statuses { - if s == r { - return s - } - } - panic(fmt.Errorf("string has invalid status: %s", s)) -} +// Conditions provide observations of the operational state of a object. +type Conditions []Condition diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go index d369fcc48..afb785759 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go @@ -28,8 +28,8 @@ import ( strings "strings" proto "github.com/gogo/protobuf/proto" - k8s_io_api_core_v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" + k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v11 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -540,113 +540,115 @@ func init() { } var fileDescriptor_af8e7a11c7a1ccd9 = []byte{ - // 1687 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcf, 0x6f, 0x1b, 0x59, - 0x1d, 0xf7, 0xd4, 0x71, 0xe2, 0xf9, 0x3a, 0xa9, 0xdb, 0xd7, 0xa2, 0x9a, 0x8a, 0x7a, 0x82, 0x57, - 0xaa, 0x52, 0xa0, 0x63, 0x5a, 0x75, 0x61, 0x59, 0x09, 0x41, 0xc7, 0x59, 0xba, 0xde, 0x4d, 0x93, - 0xf0, 0x9c, 0xb2, 0xab, 0x05, 0x09, 0xbd, 0xcc, 0x7c, 0xed, 0x3c, 0x32, 0x9e, 0x19, 0xbd, 0x37, - 0x0e, 0x64, 0x4f, 0x7b, 0x84, 0xdb, 0xc2, 0x89, 0xe3, 0x56, 0xe2, 0x4f, 0xe0, 0xc2, 0x5f, 0x40, - 0xc5, 0xa9, 0x5c, 0xd0, 0x1e, 0x90, 0x45, 0xcd, 0x15, 0x71, 0x41, 0x5c, 0x7a, 0x42, 0xef, 0xcd, - 0x4f, 0x3b, 0x4e, 0xd3, 0x45, 0x48, 0xdc, 0xe2, 0xef, 0xe7, 0xf3, 0xfd, 0xbc, 0x5f, 0xdf, 0x5f, - 0x13, 0xb8, 0x7b, 0x3c, 0x0e, 0xbd, 0x89, 0x8f, 0xd2, 0xfe, 0xc5, 0xe9, 0xc7, 0x5d, 0xd7, 0xe7, - 0x18, 0xc4, 0x77, 0x47, 0x61, 0x97, 0x45, 0xbc, 0x7b, 0x72, 0xaf, 0x3b, 0xc2, 0x00, 0x05, 0x8b, - 0xd1, 0xb3, 0x23, 0x11, 0xc6, 0x21, 0xb9, 0x55, 0xa6, 0xdb, 0x09, 0xfd, 0xa7, 0xa3, 0xd0, 0x66, - 0x11, 0xb7, 0x4f, 0xee, 0xdd, 0xbc, 0x3b, 0xe2, 0xf1, 0xd1, 0xe4, 0xd0, 0x76, 0xc3, 0x71, 0x77, - 0x14, 0x8e, 0xc2, 0xae, 0xf6, 0x3a, 0x9c, 0x0c, 0xf5, 0x2f, 0xfd, 0x43, 0xff, 0x95, 0xa8, 0xdd, - 0xec, 0x1c, 0xbf, 0x25, 0x6d, 0x9e, 0x2c, 0xe6, 0x86, 0x02, 0x97, 0xac, 0x78, 0xf3, 0x41, 0xc1, - 0x19, 0x33, 0xf7, 0x88, 0x07, 0x28, 0x4e, 0xbb, 0xd1, 0xf1, 0x48, 0x19, 0x64, 0x77, 0x8c, 0x31, - 0x5b, 0xe2, 0xd5, 0xf9, 0x31, 0x7c, 0xa9, 0x87, 0x22, 0xe6, 0x43, 0xee, 0xb2, 0x18, 0xf7, 0x05, - 0x3f, 0x61, 0x31, 0xbe, 0x8f, 0xa7, 0xc4, 0x81, 0x3a, 0x06, 0x6e, 0xe8, 0xf1, 0x60, 0xd4, 0x32, - 0x36, 0x8d, 0x2d, 0xd3, 0xb9, 0xfd, 0x6c, 0x6a, 0x55, 0x66, 0x53, 0xab, 0xfe, 0x4e, 0x6a, 0x7f, - 0x39, 0xb5, 0x48, 0xe1, 0x91, 0x59, 0x69, 0xee, 0xd7, 0xf9, 0x57, 0x0d, 0x9a, 0x25, 0xf5, 0x41, - 0x84, 0x2e, 0x79, 0x03, 0x6a, 0xcc, 0xe7, 0x4c, 0xa6, 0xa2, 0x1b, 0xa9, 0x68, 0xed, 0xa1, 0x32, - 0xd2, 0x04, 0x23, 0x1f, 0x81, 0xc9, 0xa5, 0x9c, 0xa0, 0xa0, 0x38, 0x6c, 0x5d, 0xda, 0x34, 0xb6, - 0x1a, 0xf7, 0xef, 0xda, 0xc9, 0xf9, 0xf4, 0x0d, 0xaa, 0x3b, 0xb0, 0x4f, 0xee, 0xd9, 0x07, 0xa7, - 0x11, 0x7a, 0x3b, 0xa1, 0xcb, 0xfc, 0xbd, 0xc3, 0x9f, 0xa1, 0x1b, 0x53, 0x1c, 0xa2, 0xc0, 0xc0, - 0x45, 0x67, 0x63, 0x36, 0xb5, 0xcc, 0x7e, 0xa6, 0x41, 0x0b, 0x39, 0x72, 0x1f, 0x40, 0xa2, 0x2b, - 0x30, 0xde, 0x65, 0x63, 0x6c, 0x55, 0xf5, 0x2e, 0x48, 0xba, 0x0b, 0x18, 0xe4, 0x08, 0x2d, 0xb1, - 0xc8, 0x0f, 0x61, 0x4d, 0x4e, 0xf4, 0x0a, 0xad, 0x15, 0xbd, 0x9b, 0xaf, 0xd9, 0xaf, 0x7c, 0x5f, - 0xfb, 0xc3, 0x37, 0xbf, 0xf9, 0x9d, 0x41, 0xe2, 0xe1, 0x34, 0x66, 0x53, 0x6b, 0x2d, 0xfd, 0x41, - 0x33, 0x1d, 0xf2, 0x21, 0xd4, 0xbd, 0x89, 0x60, 0x31, 0x0f, 0x83, 0x56, 0x4d, 0x6b, 0xda, 0xa5, - 0x13, 0xe6, 0x2f, 0x68, 0x47, 0xc7, 0x23, 0x65, 0x90, 0xb6, 0x7a, 0x41, 0x25, 0xbd, 0x9d, 0x7a, - 0x39, 0xeb, 0xea, 0x2d, 0xb2, 0x5f, 0x34, 0x57, 0x23, 0x0c, 0x1a, 0x02, 0x03, 0xfc, 0xb9, 0x83, - 0xc3, 0x50, 0x60, 0x6b, 0xf5, 0xbf, 0x12, 0x6f, 0xce, 0xa6, 0x56, 0x83, 0x16, 0x32, 0xb4, 0xac, - 0x49, 0xb6, 0xa0, 0xee, 0x05, 0x52, 0x5d, 0x8d, 0x6c, 0xad, 0x6d, 0x56, 0xb7, 0xcc, 0x74, 0x33, - 0xbb, 0x03, 0x6d, 0xa3, 0x39, 0x4a, 0xee, 0x41, 0x83, 0x47, 0x0f, 0x3d, 0x4f, 0xa0, 0x94, 0x28, - 0x5b, 0x75, 0x4d, 0xd6, 0xe2, 0xfd, 0xfd, 0xdc, 0x4c, 0xcb, 0x1c, 0xf2, 0x15, 0x58, 0x99, 0x08, - 0x2e, 0x5b, 0xa6, 0xe6, 0xd6, 0x67, 0x53, 0x6b, 0xe5, 0x09, 0xed, 0x4b, 0xaa, 0xad, 0xe4, 0x6d, - 0xb8, 0x8c, 0x63, 0xc6, 0xfd, 0x42, 0x13, 0x34, 0x8f, 0xcc, 0xa6, 0xd6, 0xe5, 0x77, 0xe6, 0x10, - 0xba, 0xc0, 0x24, 0x1e, 0x40, 0x94, 0xc7, 0x6b, 0xab, 0xa1, 0x2f, 0xe6, 0xc1, 0x05, 0x2f, 0xb9, - 0x34, 0x3b, 0x9c, 0xcb, 0x2a, 0x58, 0x8a, 0xdf, 0xb4, 0xa4, 0xdb, 0xf9, 0x93, 0x01, 0xcd, 0x9e, - 0x3f, 0x91, 0x31, 0x8a, 0xc7, 0x18, 0x33, 0x8f, 0xc5, 0x8c, 0xdc, 0x82, 0xea, 0x84, 0x7b, 0x69, - 0xcc, 0x37, 0xd2, 0x68, 0xab, 0x3e, 0xe9, 0x6f, 0x53, 0x65, 0x27, 0x9b, 0xb0, 0x12, 0xa8, 0x68, - 0xbc, 0xa4, 0xf1, 0xf5, 0x14, 0x5f, 0xd1, 0x71, 0xa8, 0x11, 0xf2, 0x26, 0x34, 0x3c, 0x2e, 0x23, - 0x9f, 0x9d, 0x96, 0xc2, 0xf6, 0x5a, 0x4a, 0x6c, 0x6c, 0x17, 0x10, 0x2d, 0xf3, 0xc8, 0xf7, 0xa0, - 0x1e, 0x89, 0xf0, 0x84, 0x7b, 0x28, 0x74, 0xe4, 0x9a, 0xce, 0x1b, 0x59, 0x16, 0xef, 0xa7, 0xf6, - 0x97, 0x53, 0xab, 0xf9, 0x6e, 0x28, 0x63, 0x1e, 0x8c, 0x32, 0x13, 0xcd, 0x9d, 0x3a, 0xbf, 0xa9, - 0x82, 0xd9, 0x0b, 0x03, 0x8f, 0xeb, 0xd0, 0xda, 0x84, 0x95, 0xf8, 0x34, 0xc2, 0xf4, 0x1c, 0xf9, - 0x3e, 0x55, 0x1a, 0x52, 0x8d, 0x90, 0x1d, 0x58, 0x95, 0x31, 0x8b, 0x27, 0x32, 0x3d, 0xcb, 0x83, - 0x94, 0xb3, 0x3a, 0xd0, 0xd6, 0x97, 0x53, 0x6b, 0x49, 0x2d, 0xb3, 0xf3, 0x15, 0x12, 0x16, 0x4d, - 0x35, 0xc8, 0x7b, 0x40, 0xc2, 0x43, 0x89, 0xe2, 0x04, 0xbd, 0x47, 0x49, 0xe1, 0x52, 0xe9, 0xa2, - 0x0e, 0x5f, 0x75, 0x6e, 0xa6, 0xca, 0x64, 0xef, 0x0c, 0x83, 0x2e, 0xf1, 0x22, 0x27, 0x40, 0x7c, - 0x26, 0xe3, 0x03, 0xc1, 0x02, 0xa9, 0xd7, 0x3a, 0xe0, 0x63, 0x2c, 0xd2, 0xf9, 0x75, 0xb2, 0x43, - 0x79, 0x14, 0xeb, 0xee, 0x9c, 0x51, 0xa3, 0x4b, 0x56, 0x20, 0xb7, 0x61, 0x55, 0x20, 0x93, 0x69, - 0x9a, 0x9b, 0xce, 0xe5, 0xec, 0x46, 0xa8, 0xb6, 0xd2, 0x14, 0x25, 0x77, 0x60, 0x6d, 0x8c, 0x52, - 0xb2, 0x51, 0x92, 0xb2, 0xa6, 0xd3, 0x4c, 0x89, 0x6b, 0x8f, 0x13, 0x33, 0xcd, 0xf0, 0xce, 0x3f, - 0x0d, 0x68, 0xbe, 0x8b, 0xcc, 0x8f, 0x8f, 0x7a, 0x47, 0xe8, 0x1e, 0xeb, 0xba, 0xfa, 0x6b, 0x03, - 0x6e, 0x08, 0x64, 0x5e, 0x18, 0xf8, 0xa7, 0x0b, 0x98, 0x7e, 0xae, 0xc6, 0xfd, 0x6f, 0x5d, 0x10, - 0xe9, 0x74, 0xb9, 0xb7, 0x63, 0xa5, 0xfb, 0xb8, 0x71, 0x0e, 0x81, 0x9e, 0xb7, 0x2e, 0x79, 0x04, - 0x57, 0x3d, 0x2e, 0xd9, 0xa1, 0x8f, 0x1f, 0x08, 0x1e, 0xa3, 0x06, 0x74, 0x5c, 0xd4, 0x9d, 0x2f, - 0xa7, 0xa2, 0x57, 0xb7, 0x17, 0x09, 0xf4, 0xac, 0x4f, 0xe7, 0xdf, 0x06, 0x98, 0xfd, 0x31, 0x1b, - 0x61, 0x3f, 0x18, 0x86, 0xaa, 0x85, 0x70, 0xf5, 0x63, 0xb1, 0x85, 0x68, 0x06, 0x4d, 0x30, 0x72, - 0x00, 0x75, 0x9f, 0x07, 0xc8, 0x46, 0xa8, 0x42, 0xb1, 0xba, 0xd5, 0xb8, 0x7f, 0xfb, 0x82, 0xf3, - 0xef, 0x24, 0x74, 0xe7, 0x4a, 0x96, 0x21, 0xa9, 0x41, 0xd2, 0x5c, 0x89, 0x8c, 0xa1, 0x19, 0x4d, - 0x7c, 0xbf, 0x27, 0xd0, 0xc3, 0x20, 0xe6, 0xcc, 0x97, 0x3a, 0x1a, 0x75, 0x7d, 0x7d, 0xa5, 0xf8, - 0xfe, 0xbc, 0x97, 0x73, 0x6d, 0x36, 0xb5, 0x9a, 0x0b, 0x46, 0xba, 0xa8, 0xdd, 0xf9, 0x95, 0x01, - 0x6b, 0xe9, 0x2e, 0xc8, 0x2e, 0xd4, 0xdc, 0x23, 0xc6, 0x83, 0x96, 0xa1, 0x4f, 0x73, 0xe7, 0x82, - 0x05, 0x93, 0x86, 0xa8, 0xee, 0xab, 0xb8, 0xa0, 0x9e, 0xf2, 0xa7, 0x89, 0x0c, 0xb1, 0x01, 0xdc, - 0x30, 0x88, 0x99, 0x8a, 0xf5, 0xe4, 0x8a, 0xcc, 0xa4, 0xac, 0xf5, 0x72, 0x2b, 0x2d, 0x31, 0x3a, - 0xbf, 0x33, 0xa0, 0x9e, 0x8a, 0x6e, 0xab, 0x27, 0x18, 0x89, 0x70, 0x12, 0x2d, 0x3e, 0xc1, 0x23, - 0x65, 0xa4, 0x09, 0xa6, 0xaa, 0xc5, 0x31, 0x0f, 0xbc, 0xc5, 0xaa, 0xf6, 0x3e, 0x0f, 0x3c, 0xaa, - 0x11, 0xd2, 0x05, 0x53, 0x55, 0x37, 0x19, 0x31, 0x37, 0xab, 0x69, 0x57, 0x53, 0x9a, 0xb9, 0x9b, - 0x01, 0xb4, 0xe0, 0xe4, 0x85, 0x72, 0xe5, 0xbc, 0x42, 0xd9, 0xf9, 0xbd, 0x01, 0x50, 0x9c, 0x9d, - 0x7c, 0x00, 0x75, 0x81, 0x32, 0x9c, 0x08, 0x17, 0xd3, 0x34, 0xb8, 0x73, 0x61, 0x1a, 0x24, 0xf4, - 0xfe, 0x76, 0x11, 0x09, 0x99, 0x8d, 0xe6, 0x62, 0xe4, 0x31, 0x54, 0x45, 0x3e, 0x9c, 0xd8, 0xaf, - 0xf5, 0x18, 0xc5, 0x74, 0x92, 0x77, 0x00, 0x35, 0x9b, 0x28, 0x9d, 0x8e, 0x07, 0xcd, 0x05, 0xd2, - 0xfc, 0xe5, 0x18, 0x5f, 0xe0, 0x72, 0xce, 0xed, 0x22, 0x9d, 0x7f, 0x18, 0xb0, 0x18, 0x74, 0x5f, - 0x7c, 0x99, 0xf7, 0x80, 0xa8, 0xe2, 0xca, 0x5d, 0x7c, 0xe8, 0xba, 0xe1, 0x24, 0x48, 0x06, 0xa9, - 0x64, 0xd1, 0xbc, 0x38, 0x0e, 0xce, 0x30, 0xe8, 0x12, 0x2f, 0xf2, 0x93, 0x6c, 0x18, 0xa3, 0x38, - 0x54, 0xa9, 0xa4, 0x22, 0x7b, 0x6b, 0xd9, 0xa4, 0xb7, 0x74, 0xc8, 0x5b, 0x18, 0xdb, 0x94, 0x06, - 0x2d, 0xe9, 0x75, 0x9e, 0x1b, 0x70, 0x5e, 0xd1, 0x22, 0xdf, 0x86, 0x8d, 0x08, 0x05, 0x0f, 0xbd, - 0x01, 0xba, 0x61, 0xe0, 0x25, 0xf3, 0x68, 0xcd, 0xb9, 0x3a, 0x9b, 0x5a, 0x1b, 0xfb, 0x65, 0x80, - 0xce, 0xf3, 0xd4, 0x00, 0x12, 0xf3, 0x31, 0x86, 0x93, 0x38, 0xf3, 0xbc, 0xa4, 0x3d, 0xf5, 0x00, - 0x72, 0x30, 0x87, 0xd0, 0x05, 0x26, 0xf9, 0x3e, 0x5c, 0x19, 0x32, 0xee, 0x4f, 0x04, 0x1e, 0x1c, - 0x09, 0x94, 0x47, 0xa1, 0xef, 0xe9, 0xb0, 0xaf, 0x39, 0xd7, 0x67, 0x53, 0xeb, 0xca, 0x0f, 0x16, - 0x30, 0x7a, 0x86, 0xdd, 0xf9, 0x8b, 0x01, 0x50, 0x44, 0xe8, 0xeb, 0xe5, 0xe1, 0x1d, 0x58, 0x3b, - 0x41, 0x21, 0x55, 0xeb, 0xbc, 0x34, 0xdf, 0x59, 0x7e, 0x94, 0x98, 0x69, 0x86, 0xe7, 0x21, 0x54, - 0x3d, 0x77, 0x10, 0xc9, 0x92, 0x7a, 0xe5, 0xdc, 0xa4, 0x7e, 0x00, 0x35, 0xe9, 0x86, 0x11, 0xa6, - 0xfd, 0xae, 0x9d, 0xed, 0x69, 0xa0, 0x8c, 0x2f, 0xa7, 0xd6, 0x46, 0xb6, 0x7f, 0x6d, 0xa0, 0x09, - 0xb9, 0xf3, 0x67, 0x03, 0xcc, 0x83, 0x9d, 0x41, 0x2f, 0x0c, 0x86, 0x7c, 0x34, 0xff, 0x01, 0x60, - 0xfc, 0x6f, 0x3f, 0x00, 0x8e, 0x60, 0xdd, 0x2d, 0x86, 0xba, 0xac, 0x3b, 0xd8, 0xaf, 0x3f, 0x07, - 0xea, 0xae, 0x78, 0x3d, 0x3d, 0xd6, 0x7a, 0x09, 0x90, 0x74, 0x4e, 0xb9, 0xf3, 0x55, 0x30, 0x55, - 0x40, 0xec, 0x0d, 0xb7, 0xd9, 0xe9, 0xdb, 0xd7, 0x7f, 0xfb, 0x99, 0x55, 0xf9, 0xe5, 0x53, 0xab, - 0xf2, 0xe9, 0x53, 0xab, 0xf2, 0xd9, 0x53, 0xab, 0xf2, 0xc9, 0x5f, 0x37, 0x2b, 0x9d, 0x3f, 0x18, - 0x70, 0x5d, 0x1f, 0x62, 0x31, 0xfb, 0xbf, 0x01, 0x75, 0x16, 0xf1, 0x47, 0xa5, 0xc7, 0xcd, 0xab, - 0xd1, 0xc3, 0xfd, 0x7e, 0xf2, 0xbe, 0x39, 0xe3, 0xff, 0x53, 0x6a, 0xff, 0x58, 0x85, 0x46, 0xe9, - 0x43, 0x47, 0xa5, 0x54, 0x28, 0x46, 0x2c, 0xe0, 0x1f, 0xeb, 0x89, 0x4b, 0xea, 0x4e, 0x65, 0x26, - 0x29, 0xb5, 0x57, 0x06, 0xe8, 0x3c, 0x8f, 0x7c, 0x1d, 0x4c, 0x5d, 0x12, 0x04, 0xc7, 0xac, 0x13, - 0xe9, 0xe7, 0xeb, 0x65, 0x46, 0x5a, 0xe0, 0xa4, 0x0f, 0xd7, 0xca, 0xde, 0xcc, 0x7f, 0x12, 0xf0, - 0x38, 0xa9, 0x1d, 0xa6, 0x73, 0x63, 0x36, 0xb5, 0xae, 0xed, 0x9d, 0x85, 0xe9, 0x32, 0x1f, 0xd5, - 0x02, 0x7d, 0x15, 0x3b, 0x3c, 0x56, 0x0b, 0xaf, 0x14, 0x2d, 0x70, 0x27, 0xb7, 0xd2, 0x12, 0x43, - 0xed, 0x53, 0x0f, 0xc6, 0x81, 0x8b, 0xb2, 0x55, 0x2b, 0xf6, 0xb9, 0x9f, 0x19, 0x69, 0x81, 0x93, - 0xef, 0x42, 0x53, 0xc6, 0x02, 0x31, 0x2e, 0xbe, 0x54, 0x56, 0xb5, 0x8b, 0x6e, 0xfd, 0x83, 0x79, - 0x88, 0x2e, 0x72, 0xd5, 0x87, 0x53, 0x14, 0xca, 0x98, 0xf9, 0xbd, 0xd0, 0xcb, 0xbf, 0xb2, 0xf4, - 0x87, 0xd3, 0x7e, 0x61, 0xa6, 0x65, 0x0e, 0x79, 0x0b, 0xd6, 0x25, 0x0a, 0xce, 0xfc, 0xdd, 0xc9, - 0xf8, 0x10, 0x45, 0xab, 0xae, 0x5f, 0x2e, 0x0f, 0xd4, 0x41, 0x09, 0xa3, 0x73, 0x4c, 0xa7, 0xf7, - 0xec, 0x45, 0xbb, 0xf2, 0xfc, 0x45, 0xbb, 0xf2, 0xf9, 0x8b, 0x76, 0xe5, 0x93, 0x59, 0xdb, 0x78, - 0x36, 0x6b, 0x1b, 0xcf, 0x67, 0x6d, 0xe3, 0xf3, 0x59, 0xdb, 0xf8, 0xdb, 0xac, 0x6d, 0x7c, 0xfa, - 0xf7, 0x76, 0xe5, 0xa3, 0x5b, 0xaf, 0xfc, 0x17, 0xc8, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3d, - 0x8f, 0x54, 0x44, 0x22, 0x11, 0x00, 0x00, + // 1728 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcf, 0x6f, 0x23, 0x49, + 0x15, 0x76, 0xc7, 0x4e, 0xe2, 0x2e, 0x27, 0xe3, 0x49, 0xcd, 0xa0, 0x31, 0x23, 0xc6, 0x1d, 0xbc, + 0x62, 0x94, 0x01, 0xa6, 0x4d, 0x46, 0xb3, 0xb0, 0xac, 0x84, 0x20, 0xed, 0xec, 0x66, 0xbd, 0x9b, + 0x49, 0x42, 0x39, 0xc3, 0xae, 0x16, 0x04, 0xaa, 0x74, 0x3f, 0x3b, 0x45, 0xda, 0xdd, 0xad, 0xaa, + 0x6e, 0x83, 0xf7, 0xb4, 0x47, 0xb8, 0x2d, 0x37, 0x8e, 0x3b, 0x12, 0x7f, 0x02, 0x17, 0xfe, 0x02, + 0x46, 0x9c, 0x86, 0x0b, 0xda, 0x03, 0xb2, 0x18, 0x73, 0x45, 0x5c, 0x10, 0x12, 0xca, 0x09, 0x55, + 0xf5, 0x4f, 0x3b, 0xce, 0x24, 0x8b, 0x90, 0xf6, 0xe6, 0xfe, 0xde, 0xf7, 0xbe, 0xaa, 0xae, 0x7a, + 0xbf, 0xda, 0xe8, 0xe1, 0xd9, 0xd0, 0x77, 0x22, 0x17, 0x84, 0xf9, 0xcb, 0xf1, 0x47, 0x6d, 0xdb, + 0x65, 0xe0, 0x85, 0x0f, 0x07, 0x7e, 0x9b, 0x06, 0xac, 0x3d, 0xda, 0x6e, 0x0f, 0xc0, 0x03, 0x4e, + 0x43, 0x70, 0xcc, 0x80, 0xfb, 0xa1, 0x8f, 0xef, 0x15, 0xe9, 0x66, 0x4c, 0xff, 0xd9, 0xc0, 0x37, + 0x69, 0xc0, 0xcc, 0xd1, 0xf6, 0xdd, 0x87, 0x03, 0x16, 0x9e, 0x46, 0x27, 0xa6, 0xed, 0x0f, 0xdb, + 0x03, 0x7f, 0xe0, 0xb7, 0x95, 0xd7, 0x49, 0xd4, 0x57, 0x4f, 0xea, 0x41, 0xfd, 0x8a, 0xd5, 0xee, + 0xb6, 0xce, 0xde, 0x10, 0x26, 0x8b, 0x17, 0xb3, 0x7d, 0x0e, 0x0b, 0x56, 0xbc, 0xfb, 0x38, 0xe7, + 0x0c, 0xa9, 0x7d, 0xca, 0x3c, 0xe0, 0xe3, 0x76, 0x70, 0x36, 0x90, 0x80, 0x68, 0x0f, 0x21, 0xa4, + 0x0b, 0xbc, 0x5a, 0x3f, 0x46, 0x5f, 0xea, 0x00, 0x0f, 0x59, 0x9f, 0xd9, 0x34, 0x84, 0x23, 0xce, + 0x46, 0x34, 0x84, 0xf7, 0x60, 0x8c, 0x2d, 0x54, 0x05, 0xcf, 0xf6, 0x1d, 0xe6, 0x0d, 0x1a, 0xda, + 0xa6, 0xb6, 0xa5, 0x5b, 0xf7, 0x9f, 0x4f, 0x8c, 0xd2, 0x74, 0x62, 0x54, 0xdf, 0x4a, 0xf0, 0xf3, + 0x89, 0x81, 0x73, 0x8f, 0x14, 0x25, 0x99, 0x5f, 0xeb, 0x5f, 0xcb, 0xa8, 0x5e, 0x50, 0xef, 0x05, + 0x60, 0xe3, 0xd7, 0xd0, 0x32, 0x75, 0x19, 0x15, 0x89, 0xe8, 0x7a, 0x22, 0xba, 0xbc, 0x23, 0x41, + 0x12, 0xdb, 0xf0, 0x87, 0x48, 0x67, 0x42, 0x44, 0xc0, 0x09, 0xf4, 0x1b, 0x4b, 0x9b, 0xda, 0x56, + 0xed, 0xd1, 0x43, 0x33, 0x7e, 0x3f, 0x75, 0x82, 0xf2, 0x0c, 0xcc, 0xd1, 0xb6, 0x79, 0x3c, 0x0e, + 0xc0, 0xd9, 0xf7, 0x6d, 0xea, 0x1e, 0x9e, 0xfc, 0x1c, 0xec, 0x90, 0x40, 0x1f, 0x38, 0x78, 0x36, + 0x58, 0xeb, 0xd3, 0x89, 0xa1, 0x77, 0x53, 0x0d, 0x92, 0xcb, 0xe1, 0x47, 0x08, 0x09, 0xb0, 0x39, + 0x84, 0x07, 0x74, 0x08, 0x8d, 0xb2, 0xda, 0x05, 0x4e, 0x76, 0x81, 0x7a, 0x99, 0x85, 0x14, 0x58, + 0xf8, 0x87, 0x68, 0x55, 0x44, 0x6a, 0x85, 0x46, 0x45, 0xed, 0xe6, 0xeb, 0xe6, 0x2b, 0xef, 0xd7, + 0xfc, 0xe0, 0xf5, 0x6f, 0x7d, 0xb7, 0x17, 0x7b, 0x58, 0xb5, 0xe9, 0xc4, 0x58, 0x4d, 0x1e, 0x48, + 0xaa, 0x83, 0x3f, 0x40, 0x55, 0x27, 0xe2, 0x34, 0x64, 0xbe, 0xd7, 0x58, 0x56, 0x9a, 0x66, 0xe1, + 0x0d, 0xb3, 0x1b, 0x34, 0x83, 0xb3, 0x81, 0x04, 0x84, 0x29, 0x6f, 0x50, 0x4a, 0xef, 0x26, 0x5e, + 0xd6, 0x9a, 0xbc, 0x8b, 0xf4, 0x89, 0x64, 0x6a, 0x98, 0xa2, 0x1a, 0x07, 0x0f, 0x7e, 0x61, 0x41, + 0xdf, 0xe7, 0xd0, 0x58, 0xf9, 0x9f, 0xc4, 0xeb, 0xd3, 0x89, 0x51, 0x23, 0xb9, 0x0c, 0x29, 0x6a, + 0xe2, 0x2d, 0x54, 0x75, 0x3c, 0x21, 0x8f, 0x46, 0x34, 0x56, 0x37, 0xcb, 0x5b, 0x7a, 0xb2, 0x99, + 0x83, 0x9e, 0xc2, 0x48, 0x66, 0xc5, 0xdb, 0xa8, 0xc6, 0x82, 0x1d, 0xc7, 0xe1, 0x20, 0x04, 0x88, + 0x46, 0x55, 0x91, 0x95, 0x78, 0xf7, 0x28, 0x83, 0x49, 0x91, 0x83, 0xbf, 0x82, 0x2a, 0x11, 0x67, + 0xa2, 0xa1, 0x2b, 0x6e, 0x75, 0x3a, 0x31, 0x2a, 0x4f, 0x49, 0x57, 0x10, 0x85, 0xe2, 0x37, 0xd1, + 0x0d, 0x18, 0x52, 0xe6, 0xe6, 0x9a, 0x48, 0xf1, 0xf0, 0x74, 0x62, 0xdc, 0x78, 0x6b, 0xc6, 0x42, + 0xe6, 0x98, 0xd8, 0x41, 0x28, 0xc8, 0xe2, 0xb5, 0x51, 0x53, 0x07, 0xf3, 0xf8, 0x8a, 0x9b, 0x5c, + 0x98, 0x1d, 0xd6, 0x0d, 0x19, 0x2c, 0xf9, 0x33, 0x29, 0xe8, 0xb6, 0xfe, 0xa4, 0xa1, 0x7a, 0xc7, + 0x8d, 0x44, 0x08, 0xfc, 0x09, 0x84, 0xd4, 0xa1, 0x21, 0xc5, 0xf7, 0x50, 0x39, 0x62, 0x4e, 0x12, + 0xf3, 0xb5, 0x24, 0xda, 0xca, 0x4f, 0xbb, 0xbb, 0x44, 0xe2, 0x78, 0x13, 0x55, 0x3c, 0x19, 0x8d, + 0x4b, 0xca, 0xbe, 0x96, 0xd8, 0x2b, 0x2a, 0x0e, 0x95, 0x05, 0xbf, 0x8e, 0x6a, 0x0e, 0x13, 0x81, + 0x4b, 0xc7, 0x85, 0xb0, 0xbd, 0x95, 0x10, 0x6b, 0xbb, 0xb9, 0x89, 0x14, 0x79, 0xf8, 0xfb, 0xa8, + 0x1a, 0x70, 0x7f, 0xc4, 0x1c, 0xe0, 0x2a, 0x72, 0x75, 0xeb, 0xb5, 0x34, 0x8b, 0x8f, 0x12, 0xfc, + 0x7c, 0x62, 0xd4, 0xdf, 0xf1, 0x45, 0xc8, 0xbc, 0x41, 0x0a, 0x91, 0xcc, 0xa9, 0xf5, 0x9f, 0x32, + 0xd2, 0x3b, 0xbe, 0xe7, 0x30, 0x15, 0x5a, 0xdb, 0xa8, 0x12, 0x8e, 0x03, 0x48, 0xa4, 0xee, 0xa5, + 0xfb, 0x94, 0x69, 0x78, 0x3e, 0x31, 0xd6, 0x33, 0xa2, 0x04, 0x88, 0xa2, 0xe2, 0x9f, 0xa2, 0x15, + 0x11, 0xd2, 0x30, 0x12, 0x2a, 0xca, 0x75, 0xeb, 0xed, 0xc4, 0x69, 0xa5, 0xa7, 0xd0, 0xf3, 0x89, + 0x71, 0xad, 0xc2, 0x65, 0x66, 0xda, 0xb1, 0x1f, 0x49, 0x54, 0xf1, 0xbb, 0x08, 0xfb, 0x27, 0x02, + 0xf8, 0x08, 0x9c, 0xbd, 0xb8, 0xb6, 0xc9, 0x8c, 0x92, 0xe7, 0x53, 0xb6, 0xee, 0x26, 0x6b, 0xe1, + 0xc3, 0x0b, 0x0c, 0xb2, 0xc0, 0x0b, 0xef, 0xa0, 0xaa, 0x80, 0x11, 0x70, 0x16, 0x8e, 0x55, 0xda, + 0xe8, 0xd6, 0xd7, 0xd2, 0xd3, 0xea, 0x25, 0xf8, 0xf9, 0xc4, 0xd8, 0xc8, 0xb7, 0x92, 0x80, 0x24, + 0x73, 0xc3, 0x23, 0x84, 0x5d, 0x2a, 0xc2, 0x63, 0x4e, 0x3d, 0x11, 0x1f, 0x05, 0x1b, 0x42, 0x63, + 0x35, 0x2d, 0x1a, 0xd7, 0xc9, 0x41, 0xe9, 0x91, 0x6f, 0x7d, 0xff, 0x82, 0x1a, 0x59, 0xb0, 0x02, + 0xbe, 0x8f, 0x56, 0x38, 0x50, 0xe1, 0x7b, 0x8d, 0xaa, 0xda, 0xf8, 0x8d, 0xf4, 0x98, 0x89, 0x42, + 0x49, 0x62, 0xc5, 0x0f, 0xd0, 0xea, 0x10, 0x84, 0xa0, 0x03, 0x68, 0xe8, 0x8a, 0x58, 0x4f, 0x88, + 0xab, 0x4f, 0x62, 0x98, 0xa4, 0xf6, 0xd6, 0x3f, 0x35, 0x54, 0x7f, 0x07, 0xa8, 0x1b, 0x9e, 0x76, + 0x4e, 0xc1, 0x3e, 0x53, 0xd5, 0xfb, 0x37, 0x1a, 0xba, 0xc3, 0x81, 0x3a, 0xbe, 0xe7, 0x8e, 0xe7, + 0x6c, 0x2a, 0xb8, 0x6b, 0x8f, 0xbe, 0x7d, 0x45, 0x3e, 0x91, 0xc5, 0xde, 0x96, 0x91, 0xec, 0xe3, + 0xce, 0x25, 0x04, 0x72, 0xd9, 0xba, 0x78, 0x0f, 0x6d, 0x38, 0x4c, 0xd0, 0x13, 0x17, 0xde, 0xe7, + 0x2c, 0x04, 0x65, 0x50, 0x99, 0x54, 0xb5, 0xbe, 0x9c, 0x88, 0x6e, 0xec, 0xce, 0x13, 0xc8, 0x45, + 0x9f, 0xd6, 0xbf, 0x35, 0xa4, 0x77, 0x87, 0x74, 0x00, 0x5d, 0xaf, 0xef, 0xcb, 0x46, 0xc5, 0xe4, + 0xc3, 0x7c, 0xa3, 0x52, 0x0c, 0x12, 0xdb, 0xf0, 0x31, 0xaa, 0xba, 0xcc, 0x03, 0x3a, 0x00, 0xd1, + 0x58, 0xda, 0x2c, 0x6f, 0xd5, 0x1e, 0xdd, 0xbf, 0xe2, 0xfd, 0xf7, 0x63, 0xba, 0x75, 0x33, 0x8d, + 0xac, 0x04, 0x10, 0x24, 0x53, 0xc2, 0x43, 0x54, 0x0f, 0x22, 0xd7, 0xed, 0x70, 0x70, 0xc0, 0x0b, + 0x19, 0x75, 0x85, 0x0a, 0x68, 0x55, 0xc5, 0x5f, 0x29, 0x7e, 0x34, 0xeb, 0x65, 0xdd, 0x9a, 0x4e, + 0x8c, 0xfa, 0x1c, 0x48, 0xe6, 0xb5, 0x5b, 0xbf, 0xd6, 0xd0, 0x6a, 0xb2, 0x0b, 0x7c, 0x80, 0x96, + 0xed, 0x53, 0xca, 0xbc, 0x86, 0xa6, 0xde, 0xe6, 0xc1, 0x15, 0x0b, 0xc6, 0x6d, 0x57, 0x9e, 0x57, + 0x7e, 0x40, 0x1d, 0xe9, 0x4f, 0x62, 0x19, 0x6c, 0x22, 0x64, 0xfb, 0x5e, 0x48, 0x65, 0xac, 0xc7, + 0x47, 0xa4, 0xc7, 0xc5, 0xb3, 0x93, 0xa1, 0xa4, 0xc0, 0x68, 0xfd, 0x4e, 0x43, 0xd5, 0x44, 0x74, + 0x57, 0x5e, 0xc1, 0x80, 0xfb, 0x51, 0x30, 0x7f, 0x05, 0x7b, 0x12, 0x24, 0xb1, 0x4d, 0xd6, 0xce, + 0x33, 0xe6, 0x39, 0xf3, 0xb5, 0xf3, 0x3d, 0xe6, 0x39, 0x44, 0x59, 0x70, 0x1b, 0xe9, 0xb2, 0x86, + 0x8a, 0x80, 0xda, 0x69, 0xe5, 0xdc, 0x48, 0x68, 0xfa, 0x41, 0x6a, 0x20, 0x39, 0x27, 0x2b, 0xc7, + 0x95, 0xcb, 0xca, 0x71, 0xeb, 0xf7, 0x1a, 0x42, 0xf9, 0xbb, 0xe3, 0xf7, 0x51, 0x95, 0x83, 0xf0, + 0x23, 0x6e, 0x43, 0x92, 0x06, 0x0f, 0xae, 0x4c, 0x83, 0x98, 0xde, 0xdd, 0xcd, 0x23, 0x21, 0xc5, + 0x48, 0x26, 0x86, 0x9f, 0xa0, 0x32, 0xcf, 0x46, 0x20, 0xf3, 0x5a, 0x97, 0x91, 0xcf, 0x40, 0x59, + 0x9f, 0x91, 0x13, 0x90, 0xd4, 0x69, 0x39, 0xa8, 0x3e, 0x47, 0x9a, 0x3d, 0x1c, 0xed, 0x73, 0x1c, + 0xce, 0xa5, 0xbd, 0xaa, 0xf5, 0x0f, 0x0d, 0xcd, 0x07, 0xdd, 0xe7, 0x5f, 0xe6, 0x5d, 0x84, 0x65, + 0x7d, 0x66, 0x36, 0xec, 0xd8, 0xb6, 0x1f, 0x79, 0xf1, 0xb8, 0x16, 0x2f, 0x9a, 0x15, 0xc7, 0xde, + 0x05, 0x06, 0x59, 0xe0, 0x85, 0x7f, 0x92, 0x8e, 0x7c, 0x04, 0xfa, 0x32, 0x95, 0x64, 0x64, 0x6f, + 0x2d, 0x9a, 0x27, 0x17, 0x8e, 0x92, 0x73, 0xc3, 0xa1, 0xd4, 0x20, 0x05, 0xbd, 0xd6, 0x0b, 0x0d, + 0x5d, 0x56, 0xb4, 0xf0, 0x77, 0xd0, 0x7a, 0x00, 0x9c, 0xf9, 0x4e, 0x0f, 0x6c, 0xdf, 0x73, 0xe2, + 0xa9, 0x77, 0xd9, 0xda, 0x98, 0x4e, 0x8c, 0xf5, 0xa3, 0xa2, 0x81, 0xcc, 0xf2, 0xe4, 0x98, 0x13, + 0xb2, 0x21, 0xf8, 0x51, 0x98, 0x7a, 0x2e, 0x29, 0x4f, 0x35, 0xe6, 0x1c, 0xcf, 0x58, 0xc8, 0x1c, + 0x13, 0xff, 0x00, 0xdd, 0xec, 0x53, 0xe6, 0x46, 0x1c, 0x8e, 0x4f, 0x39, 0x88, 0x53, 0xdf, 0x75, + 0x54, 0xd8, 0x2f, 0x5b, 0xb7, 0xa7, 0x13, 0xe3, 0xe6, 0xdb, 0x73, 0x36, 0x72, 0x81, 0xdd, 0xfa, + 0x8b, 0x86, 0x50, 0x1e, 0xa1, 0xd7, 0xcb, 0xc3, 0x07, 0x68, 0x75, 0x04, 0x5c, 0xc8, 0xee, 0xbb, + 0x34, 0xdb, 0x59, 0x7e, 0x14, 0xc3, 0x24, 0xb5, 0x67, 0x21, 0x54, 0xbe, 0x74, 0xdc, 0x49, 0x93, + 0xba, 0x72, 0x69, 0x52, 0x3f, 0x46, 0xcb, 0xc2, 0xf6, 0x03, 0x48, 0xc6, 0x8a, 0x66, 0xba, 0xa7, + 0x9e, 0x04, 0xe5, 0x30, 0x92, 0xee, 0x5f, 0x01, 0x24, 0x26, 0xb7, 0xfe, 0xac, 0x21, 0xfd, 0x78, + 0xbf, 0xd7, 0xf1, 0xbd, 0x3e, 0x1b, 0xcc, 0x7e, 0x66, 0x68, 0xff, 0xdf, 0xcf, 0x8c, 0x53, 0xb4, + 0x66, 0xe7, 0xa3, 0x63, 0xda, 0x1d, 0xcc, 0xeb, 0x4f, 0x9b, 0xaa, 0x2b, 0xde, 0x4e, 0x5e, 0x6b, + 0xad, 0x60, 0x10, 0x64, 0x46, 0xb9, 0xf5, 0x55, 0xa4, 0xcb, 0x80, 0x38, 0xec, 0xef, 0xd2, 0xf1, + 0x9b, 0xb7, 0x7f, 0xfb, 0xa9, 0x51, 0xfa, 0xd5, 0x33, 0xa3, 0xf4, 0xc9, 0x33, 0xa3, 0xf4, 0xe9, + 0x33, 0xa3, 0xf4, 0xf1, 0x5f, 0x37, 0x4b, 0xad, 0x3f, 0x68, 0xe8, 0xb6, 0x7a, 0x89, 0xf9, 0xec, + 0xff, 0x26, 0xaa, 0xd2, 0x80, 0xed, 0x15, 0x2e, 0x37, 0xab, 0x46, 0x3b, 0x47, 0xdd, 0xf8, 0x7e, + 0x33, 0xc6, 0x17, 0x53, 0x6a, 0xff, 0x58, 0x46, 0xb5, 0xc2, 0xe7, 0x94, 0x4c, 0x29, 0x9f, 0x0f, + 0xa8, 0xc7, 0x3e, 0x52, 0x43, 0x9b, 0x50, 0x9d, 0x4a, 0x8f, 0x53, 0xea, 0xb0, 0x68, 0x20, 0xb3, + 0x3c, 0xfc, 0x0d, 0xa4, 0xab, 0x92, 0xc0, 0x19, 0xa4, 0x9d, 0x48, 0x5d, 0x5f, 0x27, 0x05, 0x49, + 0x6e, 0xc7, 0x5d, 0x74, 0xab, 0xe8, 0x4d, 0xdd, 0xa7, 0x1e, 0x0b, 0xe3, 0xda, 0xa1, 0x5b, 0x77, + 0xa6, 0x13, 0xe3, 0xd6, 0xe1, 0x45, 0x33, 0x59, 0xe4, 0x23, 0x5b, 0xa0, 0x2b, 0x63, 0x87, 0x85, + 0x72, 0xe1, 0x4a, 0xde, 0x02, 0xf7, 0x33, 0x94, 0x14, 0x18, 0x72, 0x9f, 0x6a, 0xfc, 0xf6, 0x6c, + 0x90, 0x43, 0x73, 0xb6, 0xcf, 0xa3, 0x14, 0x24, 0xb9, 0x1d, 0x7f, 0x0f, 0xd5, 0x45, 0xc8, 0x01, + 0xc2, 0xfc, 0x7b, 0x68, 0x45, 0xb9, 0xa8, 0xd6, 0xdf, 0x9b, 0x35, 0x91, 0x79, 0xae, 0xfc, 0x3c, + 0x0b, 0x7c, 0x11, 0x52, 0xb7, 0xe3, 0x3b, 0xd9, 0xb7, 0x9c, 0xfa, 0x3c, 0x3b, 0xca, 0x61, 0x52, + 0xe4, 0xe0, 0x37, 0xd0, 0x9a, 0x00, 0xce, 0xa8, 0x7b, 0x10, 0x0d, 0x4f, 0x80, 0x27, 0xf3, 0x66, + 0x16, 0xa8, 0xbd, 0x82, 0x8d, 0xcc, 0x30, 0xad, 0xce, 0xf3, 0x97, 0xcd, 0xd2, 0x8b, 0x97, 0xcd, + 0xd2, 0x67, 0x2f, 0x9b, 0xa5, 0x8f, 0xa7, 0x4d, 0xed, 0xf9, 0xb4, 0xa9, 0xbd, 0x98, 0x36, 0xb5, + 0xcf, 0xa6, 0x4d, 0xed, 0x6f, 0xd3, 0xa6, 0xf6, 0xc9, 0xdf, 0x9b, 0xa5, 0x0f, 0xef, 0xbd, 0xf2, + 0x8f, 0x96, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x6b, 0xda, 0x16, 0x88, 0x11, 0x00, 0x00, } func (m *CertificatePrivateKey) Marshal() (dAtA []byte, err error) { @@ -873,12 +875,12 @@ func (m *Condition) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Message) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Message))) i-- - dAtA[i] = 0x32 + dAtA[i] = 0x4a i -= len(m.Reason) copy(dAtA[i:], m.Reason) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Reason))) i-- - dAtA[i] = 0x2a + dAtA[i] = 0x42 { size, err := m.LastTransitionTime.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -888,20 +890,25 @@ func (m *Condition) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenerated(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 - i = encodeVarintGenerated(dAtA, i, uint64(m.ObservedGeneration)) + dAtA[i] = 0x3a + i -= len(m.Severity) + copy(dAtA[i:], m.Severity) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Severity))) i-- - dAtA[i] = 0x18 + dAtA[i] = 0x32 i -= len(m.Status) copy(dAtA[i:], m.Status) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Status))) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x2a i -= len(m.Type) copy(dAtA[i:], m.Type) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Type))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x22 + i = encodeVarintGenerated(dAtA, i, uint64(m.ObservedGeneration)) + i-- + dAtA[i] = 0x18 return len(dAtA) - i, nil } @@ -1583,11 +1590,13 @@ func (m *Condition) Size() (n int) { } var l int _ = l + n += 1 + sovGenerated(uint64(m.ObservedGeneration)) l = len(m.Type) n += 1 + l + sovGenerated(uint64(l)) l = len(m.Status) n += 1 + l + sovGenerated(uint64(l)) - n += 1 + sovGenerated(uint64(m.ObservedGeneration)) + l = len(m.Severity) + n += 1 + l + sovGenerated(uint64(l)) l = m.LastTransitionTime.Size() n += 1 + l + sovGenerated(uint64(l)) l = len(m.Reason) @@ -1893,9 +1902,10 @@ func (this *Condition) String() string { return "nil" } s := strings.Join([]string{`&Condition{`, + `ObservedGeneration:` + fmt.Sprintf("%v", this.ObservedGeneration) + `,`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `ObservedGeneration:` + fmt.Sprintf("%v", this.ObservedGeneration) + `,`, + `Severity:` + fmt.Sprintf("%v", this.Severity) + `,`, `LastTransitionTime:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.LastTransitionTime), "Time", "v11.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, @@ -2790,7 +2800,26 @@ func (m *Condition) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: Condition: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ObservedGeneration", wireType) + } + m.ObservedGeneration = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ObservedGeneration |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) } @@ -2820,9 +2849,9 @@ func (m *Condition) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Type = string(dAtA[iNdEx:postIndex]) + m.Type = ConditionType(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 2: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) } @@ -2852,13 +2881,13 @@ func (m *Condition) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Status = k8s_io_api_core_v1.ConditionStatus(dAtA[iNdEx:postIndex]) + m.Status = k8s_io_apimachinery_pkg_apis_meta_v1.ConditionStatus(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ObservedGeneration", wireType) + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Severity", wireType) } - m.ObservedGeneration = 0 + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -2868,12 +2897,25 @@ func (m *Condition) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ObservedGeneration |= int64(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - case 4: + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Severity = ConditionSeverity(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LastTransitionTime", wireType) } @@ -2906,7 +2948,7 @@ func (m *Condition) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Reason", wireType) } @@ -2938,7 +2980,7 @@ func (m *Condition) Unmarshal(dAtA []byte) error { } m.Reason = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 6: + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Message", wireType) } diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.proto b/vendor/kmodules.xyz/client-go/api/v1/generated.proto index ff235455c..d8fc1a444 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.proto +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.proto @@ -97,16 +97,15 @@ message ClusterMetadata { optional string provider = 4; } +// Condition defines an observation of a object operational state. message Condition { // Type of condition in CamelCase or in foo.example.com/CamelCase. - // Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - // useful (see .node.status.conditions), the ability to deconflict is important. - // +required - optional string type = 1; + // Many .condition.type values are consistent across resources like Available, but because arbitrary util + // can be useful (see .node.status.util), the ability to deconflict is important. + optional string type = 4; // Status of the condition, one of True, False, Unknown. - // +required - optional string status = 2; + optional string status = 5; // If set, this represents the .metadata.generation that the condition was set based upon. // For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date @@ -114,21 +113,27 @@ message Condition { // +optional optional int64 observedGeneration = 3; + // Severity provides an explicit classification of Reason code, so the users or machines can immediately + // understand the current situation and act accordingly. + // The Severity field MUST be set only when Status=False. + // +optional + optional string severity = 6; + // Last time the condition transitioned from one status to another. - // This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - // +required - optional k8s.io.apimachinery.pkg.apis.meta.v1.Time lastTransitionTime = 4; + // This should be when the underlying condition changed. If that is not known, then using the time when + // the API field changed is acceptable. + optional k8s.io.apimachinery.pkg.apis.meta.v1.Time lastTransitionTime = 7; // The reason for the condition's last transition in CamelCase. - // The specific API may choose whether or not this field is considered a guaranteed API. + // The specific API may choose whether this field is considered a guaranteed API. // This field may not be empty. - // +required - optional string reason = 5; + // +optional + optional string reason = 8; - // A human readable message indicating details about the transition. + // A human-readable message indicating details about the transition. // This field may be empty. - // +required - optional string message = 6; + // +optional + optional string message = 9; } // HealthCheckSpec defines attributes of the health check diff --git a/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go b/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go index daeb1a75a..e33f37561 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go +++ b/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go @@ -233,11 +233,12 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, + Description: "Condition defines an observation of a object operational state.", + Type: []string{"object"}, Properties: map[string]spec.Schema{ "type": { SchemaProps: spec.SchemaProps{ - Description: "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important.", + Description: "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary util can be useful (see .node.status.util), the ability to deconflict is important.", Default: "", Type: []string{"string"}, Format: "", @@ -258,31 +259,36 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) Format: "int64", }, }, + "severity": { + SchemaProps: spec.SchemaProps{ + Description: "Severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False.", + Type: []string{"string"}, + Format: "", + }, + }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ - Description: "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", + Description: "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", Default: map[string]interface{}{}, Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), }, }, "reason": { SchemaProps: spec.SchemaProps{ - Description: "The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may not be empty.", - Default: "", + Description: "The reason for the condition's last transition in CamelCase. The specific API may choose whether this field is considered a guaranteed API. This field may not be empty.", Type: []string{"string"}, Format: "", }, }, "message": { SchemaProps: spec.SchemaProps{ - Description: "A human readable message indicating details about the transition. This field may be empty.", - Default: "", + Description: "A human-readable message indicating details about the transition. This field may be empty.", Type: []string{"string"}, Format: "", }, }, }, - Required: []string{"type", "status", "lastTransitionTime", "reason", "message"}, + Required: []string{"type", "status", "lastTransitionTime"}, }, }, Dependencies: []string{ diff --git a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go index dd2040bf1..85fa8084f 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go @@ -136,6 +136,28 @@ func (in *Condition) DeepCopy() *Condition { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in Conditions) DeepCopyInto(out *Conditions) { + { + in := &in + *out = make(Conditions, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + return + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Conditions. +func (in Conditions) DeepCopy() Conditions { + if in == nil { + return nil + } + out := new(Conditions) + in.DeepCopyInto(out) + return *out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HealthCheckSpec) DeepCopyInto(out *HealthCheckSpec) { *out = *in diff --git a/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go b/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go index 0316e88a2..a628ca661 100644 --- a/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go +++ b/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go @@ -58,7 +58,7 @@ func RegisterCRDs(client crd_cs.Interface, crds []*CustomResourceDefinition) err }, metav1.UpdateOptions{}, ) - if err != nil { + if err != nil && !kerr.IsAlreadyExists(err) { return err } } diff --git a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go index a31ac0d82..6d4b8f5ca 100644 --- a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go @@ -18121,11 +18121,12 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, + Description: "Condition defines an observation of a object operational state.", + Type: []string{"object"}, Properties: map[string]spec.Schema{ "type": { SchemaProps: spec.SchemaProps{ - Description: "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important.", + Description: "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary util can be useful (see .node.status.util), the ability to deconflict is important.", Default: "", Type: []string{"string"}, Format: "", @@ -18146,31 +18147,36 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) Format: "int64", }, }, + "severity": { + SchemaProps: spec.SchemaProps{ + Description: "Severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False.", + Type: []string{"string"}, + Format: "", + }, + }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ - Description: "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", + Description: "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", Default: map[string]interface{}{}, Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), }, }, "reason": { SchemaProps: spec.SchemaProps{ - Description: "The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may not be empty.", - Default: "", + Description: "The reason for the condition's last transition in CamelCase. The specific API may choose whether this field is considered a guaranteed API. This field may not be empty.", Type: []string{"string"}, Format: "", }, }, "message": { SchemaProps: spec.SchemaProps{ - Description: "A human readable message indicating details about the transition. This field may be empty.", - Default: "", + Description: "A human-readable message indicating details about the transition. This field may be empty.", Type: []string{"string"}, Format: "", }, }, }, - Required: []string{"type", "status", "lastTransitionTime", "reason", "message"}, + Required: []string{"type", "status", "lastTransitionTime"}, }, }, Dependencies: []string{ diff --git a/vendor/kubedb.dev/apimachinery/apis/dashboard/v1alpha1/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/dashboard/v1alpha1/openapi_generated.go index fa2e145ac..9fc124c08 100644 --- a/vendor/kubedb.dev/apimachinery/apis/dashboard/v1alpha1/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/dashboard/v1alpha1/openapi_generated.go @@ -18031,11 +18031,12 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, + Description: "Condition defines an observation of a object operational state.", + Type: []string{"object"}, Properties: map[string]spec.Schema{ "type": { SchemaProps: spec.SchemaProps{ - Description: "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important.", + Description: "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary util can be useful (see .node.status.util), the ability to deconflict is important.", Default: "", Type: []string{"string"}, Format: "", @@ -18056,31 +18057,36 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) Format: "int64", }, }, + "severity": { + SchemaProps: spec.SchemaProps{ + Description: "Severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False.", + Type: []string{"string"}, + Format: "", + }, + }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ - Description: "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", + Description: "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", Default: map[string]interface{}{}, Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), }, }, "reason": { SchemaProps: spec.SchemaProps{ - Description: "The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may not be empty.", - Default: "", + Description: "The reason for the condition's last transition in CamelCase. The specific API may choose whether this field is considered a guaranteed API. This field may not be empty.", Type: []string{"string"}, Format: "", }, }, "message": { SchemaProps: spec.SchemaProps{ - Description: "A human readable message indicating details about the transition. This field may be empty.", - Default: "", + Description: "A human-readable message indicating details about the transition. This field may be empty.", Type: []string{"string"}, Format: "", }, }, }, - Required: []string{"type", "status", "lastTransitionTime", "reason", "message"}, + Required: []string{"type", "status", "lastTransitionTime"}, }, }, Dependencies: []string{ diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/constants.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/constants.go index 306028406..74d185e86 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/constants.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/constants.go @@ -534,14 +534,18 @@ const ( KafkaBrokerListener = "KafkaBrokerListener" KafkaControllerListener = "KafkaControllerListener" - KafkaDataDir = "/var/log/kafka" - KafkaMetaDataDir = "/var/log/kafka/metadata" - KafkaCertDir = "/var/private/ssl" - KafkaConfigDir = "/opt/kafka/config/kafkaconfig" - KafkaTempConfigDir = "/opt/kafka/config/temp-config" - KafkaConfigFileName = "config.properties" - KafkaSSLPropertiesFileName = "ssl.properties" - KafkaClientAuthConfigFileName = "clientauth.properties" + KafkaDataDir = "/var/log/kafka" + KafkaMetaDataDir = "/var/log/kafka/metadata" + KafkaCertDir = "/var/private/ssl" + KafkaConfigDir = "/opt/kafka/config/kafkaconfig" + KafkaTempConfigDir = "/opt/kafka/config/temp-config" + KafkaCustomConfigDir = "/opt/kafka/config/custom-config" + KafkaConfigFileName = "config.properties" + KafkaServerCustomConfigFileName = "server.properties" + KafkaBrokerCustomConfigFileName = "broker.properties" + KafkaControllerCustomConfigFileName = "controller.properties" + KafkaSSLPropertiesFileName = "ssl.properties" + KafkaClientAuthConfigFileName = "clientauth.properties" KafkaListeners = "listeners" KafkaAdvertisedListeners = "advertised.listeners" @@ -579,9 +583,10 @@ const ( KafkaServiceName = "serviceName" KafkaSASLPlainMechanism = "PLAIN" - KafkaVolumeData = "data" - KafkaVolumeConfig = "kafkaconfig" - KafkaVolumeTempConfig = "temp-config" + KafkaVolumeData = "data" + KafkaVolumeConfig = "kafkaconfig" + KafkaVolumeTempConfig = "temp-config" + KafkaVolumeCustomConfig = "custom-config" EnvKafkaUser = "KAFKA_USER" EnvKafkaPassword = "KAFKA_PASSWORD" diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/elasticsearch_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/elasticsearch_helpers.go index b239dd9b4..2d3dc9f1a 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/elasticsearch_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/elasticsearch_helpers.go @@ -51,6 +51,10 @@ func (_ Elasticsearch) CustomResourceDefinition() *apiextensions.CustomResourceD return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralElasticsearch)) } +func (e *Elasticsearch) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(e, SchemeGroupVersion.WithKind(ResourceKindElasticsearch)) +} + var _ apis.ResourceInfo = &Elasticsearch{} func (e Elasticsearch) OffshootName() string { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/etcd_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/etcd_helpers.go index a98085d19..6f7e09509 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/etcd_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/etcd_helpers.go @@ -25,6 +25,7 @@ import ( promapi "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "gomodules.xyz/pointer" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appslister "k8s.io/client-go/listers/apps/v1" "kmodules.xyz/client-go/apiextensions" @@ -37,6 +38,10 @@ func (_ Etcd) CustomResourceDefinition() *apiextensions.CustomResourceDefinition return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralEtcd)) } +func (e *Etcd) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(e, SchemeGroupVersion.WithKind(ResourceKindEtcd)) +} + var _ apis.ResourceInfo = &Etcd{} func (e Etcd) OffshootName() string { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/kafka_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/kafka_helpers.go index 2e0ccaf81..a23feda17 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/kafka_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/kafka_helpers.go @@ -39,6 +39,10 @@ func (k *Kafka) CustomResourceDefinition() *apiextensions.CustomResourceDefiniti return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralKafka)) } +func (k *Kafka) AsOwner() *meta.OwnerReference { + return meta.NewControllerRef(k, SchemeGroupVersion.WithKind(ResourceKindKafka)) +} + func (k *Kafka) ResourceShortCode() string { return ResourceCodeKafka } diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/kafka_types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/kafka_types.go index 0e856a862..3696b857d 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/kafka_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/kafka_types.go @@ -83,6 +83,11 @@ type KafkaSpec struct { // +optional AuthSecret *SecretReference `json:"authSecret,omitempty"` + // ConfigSecret is an optional field to provide custom configuration file for database (i.e config.properties). + // If specified, this file will be used as configuration file otherwise default configuration file will be used. + // +optional + ConfigSecret *core.LocalObjectReference `json:"configSecret,omitempty"` + // Keystore encryption secret // +optional KeystoreCredSecret *SecretReference `json:"keystoreCredSecret,omitempty"` diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mariadb_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mariadb_helpers.go index a422ca821..b37b4f328 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mariadb_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mariadb_helpers.go @@ -43,6 +43,10 @@ func (_ MariaDB) CustomResourceDefinition() *apiextensions.CustomResourceDefinit return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralMariaDB)) } +func (m *MariaDB) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(m, SchemeGroupVersion.WithKind(ResourceKindMariaDB)) +} + var _ apis.ResourceInfo = &MariaDB{} func (m MariaDB) OffshootName() string { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/memcached_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/memcached_helpers.go index 070c18a4a..62ea81591 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/memcached_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/memcached_helpers.go @@ -24,6 +24,7 @@ import ( "kubedb.dev/apimachinery/crds" promapi "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appslister "k8s.io/client-go/listers/apps/v1" "kmodules.xyz/client-go/apiextensions" @@ -36,6 +37,10 @@ func (_ Memcached) CustomResourceDefinition() *apiextensions.CustomResourceDefin return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralMemcached)) } +func (m *Memcached) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(m, SchemeGroupVersion.WithKind(ResourceKindMemcached)) +} + var _ apis.ResourceInfo = &Memcached{} func (m Memcached) OffshootName() string { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mongodb_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mongodb_helpers.go index c25fdb911..b325b7c83 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mongodb_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mongodb_helpers.go @@ -46,6 +46,10 @@ func (_ MongoDB) CustomResourceDefinition() *apiextensions.CustomResourceDefinit return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralMongoDB)) } +func (m *MongoDB) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(m, SchemeGroupVersion.WithKind(ResourceKindMongoDB)) +} + var _ apis.ResourceInfo = &MongoDB{} const ( diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mysql_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mysql_helpers.go index fb9445b72..d95264e15 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mysql_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mysql_helpers.go @@ -42,6 +42,10 @@ func (_ MySQL) CustomResourceDefinition() *apiextensions.CustomResourceDefinitio return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralMySQL)) } +func (m *MySQL) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(m, SchemeGroupVersion.WithKind(ResourceKindMySQL)) +} + var _ apis.ResourceInfo = &MySQL{} func (m MySQL) OffshootName() string { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go index 7cf112a67..a4738df42 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go @@ -18146,11 +18146,12 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, + Description: "Condition defines an observation of a object operational state.", + Type: []string{"object"}, Properties: map[string]spec.Schema{ "type": { SchemaProps: spec.SchemaProps{ - Description: "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important.", + Description: "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary util can be useful (see .node.status.util), the ability to deconflict is important.", Default: "", Type: []string{"string"}, Format: "", @@ -18171,31 +18172,36 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) Format: "int64", }, }, + "severity": { + SchemaProps: spec.SchemaProps{ + Description: "Severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False.", + Type: []string{"string"}, + Format: "", + }, + }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ - Description: "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", + Description: "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", Default: map[string]interface{}{}, Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), }, }, "reason": { SchemaProps: spec.SchemaProps{ - Description: "The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may not be empty.", - Default: "", + Description: "The reason for the condition's last transition in CamelCase. The specific API may choose whether this field is considered a guaranteed API. This field may not be empty.", Type: []string{"string"}, Format: "", }, }, "message": { SchemaProps: spec.SchemaProps{ - Description: "A human readable message indicating details about the transition. This field may be empty.", - Default: "", + Description: "A human-readable message indicating details about the transition. This field may be empty.", Type: []string{"string"}, Format: "", }, }, }, - Required: []string{"type", "status", "lastTransitionTime", "reason", "message"}, + Required: []string{"type", "status", "lastTransitionTime"}, }, }, Dependencies: []string{ @@ -22945,6 +22951,12 @@ func schema_apimachinery_apis_kubedb_v1alpha2_KafkaSpec(ref common.ReferenceCall Ref: ref("kubedb.dev/apimachinery/apis/kubedb/v1alpha2.SecretReference"), }, }, + "configSecret": { + SchemaProps: spec.SchemaProps{ + Description: "ConfigSecret is an optional field to provide custom configuration file for database (i.e config.properties). If specified, this file will be used as configuration file otherwise default configuration file will be used.", + Ref: ref("k8s.io/api/core/v1.LocalObjectReference"), + }, + }, "keystoreCredSecret": { SchemaProps: spec.SchemaProps{ Description: "Keystore encryption secret", @@ -23003,7 +23015,7 @@ func schema_apimachinery_apis_kubedb_v1alpha2_KafkaSpec(ref common.ReferenceCall }, }, Dependencies: []string{ - "k8s.io/api/core/v1.PersistentVolumeClaimSpec", "kmodules.xyz/client-go/api/v1.HealthCheckSpec", "kmodules.xyz/client-go/api/v1.TLSConfig", "kmodules.xyz/monitoring-agent-api/api/v1.AgentSpec", "kmodules.xyz/offshoot-api/api/v1.PodTemplateSpec", "kubedb.dev/apimachinery/apis/kubedb/v1alpha2.KafkaClusterTopology", "kubedb.dev/apimachinery/apis/kubedb/v1alpha2.NamedServiceTemplateSpec", "kubedb.dev/apimachinery/apis/kubedb/v1alpha2.SecretReference"}, + "k8s.io/api/core/v1.LocalObjectReference", "k8s.io/api/core/v1.PersistentVolumeClaimSpec", "kmodules.xyz/client-go/api/v1.HealthCheckSpec", "kmodules.xyz/client-go/api/v1.TLSConfig", "kmodules.xyz/monitoring-agent-api/api/v1.AgentSpec", "kmodules.xyz/offshoot-api/api/v1.PodTemplateSpec", "kubedb.dev/apimachinery/apis/kubedb/v1alpha2.KafkaClusterTopology", "kubedb.dev/apimachinery/apis/kubedb/v1alpha2.NamedServiceTemplateSpec", "kubedb.dev/apimachinery/apis/kubedb/v1alpha2.SecretReference"}, } } diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/perconaxtradb_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/perconaxtradb_helpers.go index c4b9faa97..e830e4a07 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/perconaxtradb_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/perconaxtradb_helpers.go @@ -43,6 +43,10 @@ func (_ PerconaXtraDB) CustomResourceDefinition() *apiextensions.CustomResourceD return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralPerconaXtraDB)) } +func (p *PerconaXtraDB) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(p, SchemeGroupVersion.WithKind(ResourceKindPerconaXtraDB)) +} + var _ apis.ResourceInfo = &PerconaXtraDB{} func (p PerconaXtraDB) OffshootName() string { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/pgbouncer_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/pgbouncer_helpers.go index 29c9c1048..4fcaadeee 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/pgbouncer_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/pgbouncer_helpers.go @@ -27,6 +27,7 @@ import ( promapi "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "gomodules.xyz/pointer" core "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appslister "k8s.io/client-go/listers/apps/v1" kmapi "kmodules.xyz/client-go/api/v1" @@ -40,6 +41,10 @@ func (p PgBouncer) CustomResourceDefinition() *apiextensions.CustomResourceDefin return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralPgBouncer)) } +func (p *PgBouncer) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(p, SchemeGroupVersion.WithKind(ResourceKindPgBouncer)) +} + var _ apis.ResourceInfo = &PgBouncer{} func (p PgBouncer) OffshootName() string { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/postgres_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/postgres_helpers.go index 0e50b0414..a771cd527 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/postgres_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/postgres_helpers.go @@ -46,6 +46,10 @@ func (_ Postgres) CustomResourceDefinition() *apiextensions.CustomResourceDefini return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralPostgres)) } +func (p *Postgres) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(p, SchemeGroupVersion.WithKind(ResourceKindPostgres)) +} + var _ apis.ResourceInfo = &Postgres{} func (p Postgres) OffshootName() string { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/proxysql_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/proxysql_helpers.go index ecde6f466..ed94d810b 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/proxysql_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/proxysql_helpers.go @@ -25,6 +25,7 @@ import ( promapi "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "gomodules.xyz/pointer" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appslister "k8s.io/client-go/listers/apps/v1" kmapi "kmodules.xyz/client-go/api/v1" @@ -38,6 +39,10 @@ func (_ ProxySQL) CustomResourceDefinition() *apiextensions.CustomResourceDefini return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralProxySQL)) } +func (p *ProxySQL) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(p, SchemeGroupVersion.WithKind(ResourceKindProxySQL)) +} + var _ apis.ResourceInfo = &ProxySQL{} func (p ProxySQL) OffshootName() string { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/redis_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/redis_helpers.go index ef9cba182..dd88d1416 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/redis_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/redis_helpers.go @@ -46,6 +46,10 @@ func (r Redis) CustomResourceDefinition() *apiextensions.CustomResourceDefinitio return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralRedis)) } +func (r *Redis) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(r, SchemeGroupVersion.WithKind(ResourceKindRedis)) +} + var _ apis.ResourceInfo = &Redis{} func (r Redis) OffshootName() string { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/redis_sentinel_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/redis_sentinel_helpers.go index 04a4a7a46..7ab470328 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/redis_sentinel_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/redis_sentinel_helpers.go @@ -42,6 +42,10 @@ func (rs RedisSentinel) CustomResourceDefinition() *apiextensions.CustomResource return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralRedisSentinel)) } +func (rs *RedisSentinel) AsOwner() *metav1.OwnerReference { + return metav1.NewControllerRef(rs, SchemeGroupVersion.WithKind(ResourceKindRedisSentinel)) +} + var _ apis.ResourceInfo = &RedisSentinel{} func (rs RedisSentinel) OffshootName() string { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go index 25ef9a0fb..72046bcf3 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go @@ -913,6 +913,11 @@ func (in *KafkaSpec) DeepCopyInto(out *KafkaSpec) { *out = new(SecretReference) **out = **in } + if in.ConfigSecret != nil { + in, out := &in.ConfigSecret, &out.ConfigSecret + *out = new(corev1.LocalObjectReference) + **out = **in + } if in.KeystoreCredSecret != nil { in, out := &in.KeystoreCredSecret, &out.KeystoreCredSecret *out = new(SecretReference) diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_elasticsearchautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_elasticsearchautoscalers.yaml index a9a187cce..0ba8c42d1 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_elasticsearchautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_elasticsearchautoscalers.yaml @@ -397,14 +397,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_etcdautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_etcdautoscalers.yaml index 5fd0ee51d..3c6cda582 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_etcdautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_etcdautoscalers.yaml @@ -454,14 +454,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mariadbautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mariadbautoscalers.yaml index bd615c8d2..f94e6c30e 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mariadbautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mariadbautoscalers.yaml @@ -211,14 +211,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_memcachedautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_memcachedautoscalers.yaml index b79d6fb08..6f12c65a9 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_memcachedautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_memcachedautoscalers.yaml @@ -454,14 +454,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mongodbautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mongodbautoscalers.yaml index 10c8f49c5..e2f2ca676 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mongodbautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mongodbautoscalers.yaml @@ -549,14 +549,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mysqlautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mysqlautoscalers.yaml index 712a87519..8e09fd413 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mysqlautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_mysqlautoscalers.yaml @@ -211,14 +211,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_perconaxtradbautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_perconaxtradbautoscalers.yaml index d10cb4d18..98b7203f9 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_perconaxtradbautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_perconaxtradbautoscalers.yaml @@ -211,14 +211,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_pgbouncerautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_pgbouncerautoscalers.yaml index 9aa08e3a1..50b78ab41 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_pgbouncerautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_pgbouncerautoscalers.yaml @@ -454,14 +454,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_postgresautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_postgresautoscalers.yaml index 1689d7b2e..067651df0 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_postgresautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_postgresautoscalers.yaml @@ -209,14 +209,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_proxysqlautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_proxysqlautoscalers.yaml index 3c44075f5..d4c5969ed 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_proxysqlautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_proxysqlautoscalers.yaml @@ -190,14 +190,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_redisautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_redisautoscalers.yaml index cd94d3e16..8eacfaa35 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_redisautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_redisautoscalers.yaml @@ -329,14 +329,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_redissentinelautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_redissentinelautoscalers.yaml index 6646bb8cf..8c04ef5fe 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_redissentinelautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_redissentinelautoscalers.yaml @@ -190,14 +190,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/dashboard.kubedb.com_elasticsearchdashboards.yaml b/vendor/kubedb.dev/apimachinery/crds/dashboard.kubedb.com_elasticsearchdashboards.yaml index ecaae6327..cb9e5876e 100644 --- a/vendor/kubedb.dev/apimachinery/crds/dashboard.kubedb.com_elasticsearchdashboards.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/dashboard.kubedb.com_elasticsearchdashboards.yaml @@ -2591,14 +2591,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_elasticsearches.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_elasticsearches.yaml index 0f41f260b..ebcf30569 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_elasticsearches.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_elasticsearches.yaml @@ -5002,14 +5002,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_etcds.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_etcds.yaml index 3d948916e..8bb59f9a4 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_etcds.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_etcds.yaml @@ -3486,14 +3486,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_kafkas.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_kafkas.yaml index e03f10318..557ad4a0f 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_kafkas.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_kafkas.yaml @@ -49,6 +49,12 @@ spec: type: string type: object x-kubernetes-map-type: atomic + configSecret: + properties: + name: + type: string + type: object + x-kubernetes-map-type: atomic disableSecurity: type: boolean enableSSL: @@ -3096,14 +3102,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mariadbs.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mariadbs.yaml index 5645ceeba..90967540b 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mariadbs.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mariadbs.yaml @@ -3764,14 +3764,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_memcacheds.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_memcacheds.yaml index 73190581e..e302053fe 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_memcacheds.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_memcacheds.yaml @@ -3471,14 +3471,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mongodbs.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mongodbs.yaml index 6a1716f22..11448f91d 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mongodbs.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mongodbs.yaml @@ -15814,14 +15814,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mysqls.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mysqls.yaml index 0e5ac8170..5f2142ae2 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mysqls.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mysqls.yaml @@ -6242,14 +6242,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_perconaxtradbs.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_perconaxtradbs.yaml index e2145aaa9..95470e954 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_perconaxtradbs.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_perconaxtradbs.yaml @@ -3777,14 +3777,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_pgbouncers.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_pgbouncers.yaml index e6b9db861..c9778c55c 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_pgbouncers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_pgbouncers.yaml @@ -2881,14 +2881,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_postgreses.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_postgreses.yaml index 096299a41..43e81de4d 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_postgreses.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_postgreses.yaml @@ -3816,14 +3816,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_proxysqls.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_proxysqls.yaml index c25fe30b3..0d2628be0 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_proxysqls.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_proxysqls.yaml @@ -2857,14 +2857,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redises.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redises.yaml index 3de8105db..15de3a916 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redises.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redises.yaml @@ -3780,14 +3780,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redissentinels.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redissentinels.yaml index a34efaacd..cee9c0564 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redissentinels.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redissentinels.yaml @@ -2878,14 +2878,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_elasticsearchopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_elasticsearchopsrequests.yaml index 31852bf5a..a3352a917 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_elasticsearchopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_elasticsearchopsrequests.yaml @@ -605,14 +605,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_etcdopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_etcdopsrequests.yaml index f4fdb51b4..4048fa461 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_etcdopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_etcdopsrequests.yaml @@ -208,14 +208,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mariadbopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mariadbopsrequests.yaml index b61b3f1d7..dadc8ab42 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mariadbopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mariadbopsrequests.yaml @@ -305,14 +305,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_memcachedopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_memcachedopsrequests.yaml index bc1526b03..80f464ed3 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_memcachedopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_memcachedopsrequests.yaml @@ -216,14 +216,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mongodbopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mongodbopsrequests.yaml index 10c099b85..e2cf502ca 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mongodbopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mongodbopsrequests.yaml @@ -586,14 +586,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mysqlopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mysqlopsrequests.yaml index 3fe2319a9..c9909e43b 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mysqlopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_mysqlopsrequests.yaml @@ -303,14 +303,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_perconaxtradbopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_perconaxtradbopsrequests.yaml index a3328b7a7..5deed27e6 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_perconaxtradbopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_perconaxtradbopsrequests.yaml @@ -305,14 +305,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_pgbounceropsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_pgbounceropsrequests.yaml index f8866e292..8febbb07f 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_pgbounceropsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_pgbounceropsrequests.yaml @@ -205,14 +205,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_postgresopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_postgresopsrequests.yaml index c09b73963..48df4a95c 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_postgresopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_postgresopsrequests.yaml @@ -323,14 +323,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_proxysqlopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_proxysqlopsrequests.yaml index d05786c6c..e3ee8c054 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_proxysqlopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_proxysqlopsrequests.yaml @@ -291,14 +291,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_redisopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_redisopsrequests.yaml index f74117fd2..abb9e1077 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_redisopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_redisopsrequests.yaml @@ -2658,14 +2658,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_redissentinelopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_redissentinelopsrequests.yaml index ca55ee8d8..1b16e5683 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_redissentinelopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_redissentinelopsrequests.yaml @@ -2610,14 +2610,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/postgres.kubedb.com_publishers.yaml b/vendor/kubedb.dev/apimachinery/crds/postgres.kubedb.com_publishers.yaml index 9f3a30c35..3ae67efc6 100644 --- a/vendor/kubedb.dev/apimachinery/crds/postgres.kubedb.com_publishers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/postgres.kubedb.com_publishers.yaml @@ -164,14 +164,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/postgres.kubedb.com_subscribers.yaml b/vendor/kubedb.dev/apimachinery/crds/postgres.kubedb.com_subscribers.yaml index 0cb4d0f45..c0bf3ea46 100644 --- a/vendor/kubedb.dev/apimachinery/crds/postgres.kubedb.com_subscribers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/postgres.kubedb.com_subscribers.yaml @@ -140,14 +140,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mariadbdatabases.yaml b/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mariadbdatabases.yaml index 355087f34..1843a50fc 100644 --- a/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mariadbdatabases.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mariadbdatabases.yaml @@ -4017,14 +4017,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mongodbdatabases.yaml b/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mongodbdatabases.yaml index 1ec66392b..edfe1967b 100644 --- a/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mongodbdatabases.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mongodbdatabases.yaml @@ -4011,14 +4011,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mysqldatabases.yaml b/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mysqldatabases.yaml index 437056e42..befd3187e 100644 --- a/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mysqldatabases.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_mysqldatabases.yaml @@ -4020,14 +4020,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_postgresdatabases.yaml b/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_postgresdatabases.yaml index 4ba83da7a..46e19f6c7 100644 --- a/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_postgresdatabases.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/schema.kubedb.com_postgresdatabases.yaml @@ -4023,14 +4023,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_elasticsearchinsights.yaml b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_elasticsearchinsights.yaml index dc2e1db42..d66efe223 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_elasticsearchinsights.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_elasticsearchinsights.yaml @@ -98,14 +98,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mariadbinsights.yaml b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mariadbinsights.yaml index 97ac51aa2..d5f416b5c 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mariadbinsights.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mariadbinsights.yaml @@ -91,14 +91,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mongodbinsights.yaml b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mongodbinsights.yaml index 3df2fd30b..716d67c24 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mongodbinsights.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mongodbinsights.yaml @@ -122,14 +122,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mysqlinsights.yaml b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mysqlinsights.yaml index 77b94f199..8b84263ef 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mysqlinsights.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_mysqlinsights.yaml @@ -91,14 +91,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_pgbouncerinsights.yaml b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_pgbouncerinsights.yaml index 512194e76..1649d484f 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_pgbouncerinsights.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_pgbouncerinsights.yaml @@ -104,14 +104,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_postgresinsights.yaml b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_postgresinsights.yaml index 754aba0d6..5f819450b 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_postgresinsights.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_postgresinsights.yaml @@ -99,14 +99,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_proxysqlinsights.yaml b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_proxysqlinsights.yaml index ec09a65bd..929e60108 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_proxysqlinsights.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_proxysqlinsights.yaml @@ -107,14 +107,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_redisinsights.yaml b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_redisinsights.yaml index 4197e8772..c42b1db2e 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_redisinsights.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ui.kubedb.com_redisinsights.yaml @@ -91,14 +91,14 @@ spec: type: integer reason: type: string + severity: + type: string status: type: string type: type: string required: - lastTransitionTime - - message - - reason - status - type type: object diff --git a/vendor/modules.txt b/vendor/modules.txt index 65f43876f..7a2baacfe 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1263,7 +1263,7 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/strings/slices k8s.io/utils/trace -# kmodules.xyz/client-go v0.25.23 +# kmodules.xyz/client-go v0.25.27 ## explicit; go 1.18 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 @@ -1284,7 +1284,7 @@ kmodules.xyz/monitoring-agent-api/api/v1 # kmodules.xyz/offshoot-api v0.25.4 ## explicit; go 1.18 kmodules.xyz/offshoot-api/api/v1 -# kubedb.dev/apimachinery v0.33.2-0.20230613082109-19397df99ef7 +# kubedb.dev/apimachinery v0.34.1-0.20230724122802-eb1b7f2152cc ## explicit; go 1.18 kubedb.dev/apimachinery/apis kubedb.dev/apimachinery/apis/catalog From 2ce8d74cb502a1d77f6a64d5fecee9af4824b485 Mon Sep 17 00:00:00 2001 From: Pritam Date: Tue, 25 Jul 2023 11:50:34 +0600 Subject: [PATCH 15/24] Updated custom role name for user. Signed-off-by: Pritam --- elasticsearch/api.go | 2 +- elasticsearch/es_client_v7.go | 4 ++-- elasticsearch/es_client_v8.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/elasticsearch/api.go b/elasticsearch/api.go index e047d11b5..4b9233c9b 100644 --- a/elasticsearch/api.go +++ b/elasticsearch/api.go @@ -28,7 +28,7 @@ var ( writeRequestIndex = "kubedb-system" writeRequestID = "info" writeRequestType = "_doc" - CustomUserName = "custom_user" + CustomRoleName = "readWriteAnyDatabase" PrivilegeRead = "read" PrivilegeWrite = "write" PrivilegeCreateIndex = "create_index" diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index d6c6fd02c..e450e6e5d 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -305,7 +305,7 @@ func (es *ESClientV7) GetTotalDiskUsage(ctx context.Context) (string, error) { func (es *ESClientV7) GetDBUserRole(ctx context.Context) (error, bool) { req := esapi.SecurityGetRoleRequest{ - Name: []string{CustomUserName}, + Name: []string{CustomRoleName}, } res, err := req.Do(ctx, es.client.Transport) defer func(Body io.ReadCloser) { @@ -358,7 +358,7 @@ func (es *ESClientV7) CreateDBUserRole(ctx context.Context) error { } body := bytes.NewReader(userRoleReqJSON) req := esapi.SecurityPutRoleRequest{ - Name: CustomUserName, + Name: CustomRoleName, Body: body, } diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index 1df663007..c963583ee 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -304,7 +304,7 @@ func (es *ESClientV8) GetTotalDiskUsage(ctx context.Context) (string, error) { func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { req := esapi.SecurityGetRoleRequest{ - Name: []string{CustomUserName}, + Name: []string{CustomRoleName}, } res, err := req.Do(ctx, es.client.Transport) defer func(Body io.ReadCloser) { @@ -357,7 +357,7 @@ func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { } body := bytes.NewReader(userRoleReqJSON) req := esapi.SecurityPutRoleRequest{ - Name: CustomUserName, + Name: CustomRoleName, Body: body, } From a6c45262972aa09167e6bd9b73d6f4c3d113ba5f Mon Sep 17 00:00:00 2001 From: Pritam Date: Tue, 25 Jul 2023 12:06:55 +0600 Subject: [PATCH 16/24] Testing with empty cluster privileges Signed-off-by: Pritam --- elasticsearch/es_client_v8.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index c963583ee..2f6fc4d7f 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -329,7 +329,7 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{ClusterAccessAll}, + []string{}, []DBPrivileges{ { []string{PrivilegeIndexAny}, From 0a24227240c618cf45f309ce01782538db3947ee Mon Sep 17 00:00:00 2001 From: Pritam Date: Tue, 25 Jul 2023 13:21:27 +0600 Subject: [PATCH 17/24] Updated cluster privileges. Signed-off-by: Pritam --- elasticsearch/es_client_v8.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index 2f6fc4d7f..d015fa657 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -329,7 +329,7 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{}, + []string{"^/(?!manage_security$)[a-z0-9]+$"}, []DBPrivileges{ { []string{PrivilegeIndexAny}, From 1f895be942ef94cf73782bad775c918f0739c181 Mon Sep 17 00:00:00 2001 From: Pritam Date: Tue, 25 Jul 2023 13:29:37 +0600 Subject: [PATCH 18/24] just testing Signed-off-by: Pritam --- elasticsearch/es_client_v8.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index d015fa657..a3fd7d814 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -329,7 +329,7 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{"^/(?!manage_security$)[a-z0-9]+$"}, + []string{"*"}, []DBPrivileges{ { []string{PrivilegeIndexAny}, From e4ff62ab817d84752cabbec5302b47662e6d91bc Mon Sep 17 00:00:00 2001 From: Pritam Date: Tue, 25 Jul 2023 14:17:27 +0600 Subject: [PATCH 19/24] just testing2 Signed-off-by: Pritam --- elasticsearch/es_client_v8.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index a3fd7d814..5b2da93f4 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -329,7 +329,7 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{"*"}, + []string{"^(?!security_manager$)[a-z0-9]+$"}, []DBPrivileges{ { []string{PrivilegeIndexAny}, From 577fc0bff042090455edfb7bc339ce9654199d35 Mon Sep 17 00:00:00 2001 From: Pritam Date: Tue, 25 Jul 2023 14:23:25 +0600 Subject: [PATCH 20/24] Just testing 3 Signed-off-by: Pritam --- elasticsearch/es_client_v8.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index 5b2da93f4..ed307600d 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -329,7 +329,7 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{"^(?!security_manager$)[a-z0-9]+$"}, + []string{"^(?!security_manager$)[a-z_]+$"}, []DBPrivileges{ { []string{PrivilegeIndexAny}, From 5bbc11f2e99c67a7d7c5a6fba0ad6a73b8caa58a Mon Sep 17 00:00:00 2001 From: Pritam Date: Tue, 25 Jul 2023 14:36:53 +0600 Subject: [PATCH 21/24] Just testing 4 Signed-off-by: Pritam --- elasticsearch/es_client_v8.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index ed307600d..2f6fc4d7f 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -329,7 +329,7 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{"^(?!security_manager$)[a-z_]+$"}, + []string{}, []DBPrivileges{ { []string{PrivilegeIndexAny}, From 5e5a63b48ff96ea98ace3368c9ade4d3811f46aa Mon Sep 17 00:00:00 2001 From: Pritam Date: Tue, 25 Jul 2023 15:38:08 +0600 Subject: [PATCH 22/24] Applied some cluster privileges according to priority. Signed-off-by: Pritam --- elasticsearch/api.go | 6 ++++++ elasticsearch/es_client_v7.go | 2 +- elasticsearch/es_client_v8.go | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/elasticsearch/api.go b/elasticsearch/api.go index 4b9233c9b..3c8f18af6 100644 --- a/elasticsearch/api.go +++ b/elasticsearch/api.go @@ -35,6 +35,12 @@ var ( PrivilegeIndexAny = "*" ClusterAccessAll = "all" ApplicationKibana = "kibana-.kibana" + CreateSnapshot = "create_snapshot" + Manage = "manage" + ManageILM = "manage_ilm" + ManageRoleup = "manage_rollup" + Monitor = "monitor" + ReadSecurity = "read_security" ) type DBPrivileges struct { diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index e450e6e5d..7f82941bd 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -330,7 +330,7 @@ func (es *ESClientV7) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV7) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{ClusterAccessAll}, + []string{CreateSnapshot, Manage, ManageILM, ManageRoleup, Monitor, ReadSecurity}, []DBPrivileges{ { []string{PrivilegeIndexAny}, diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index 2f6fc4d7f..225438e32 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -329,7 +329,7 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{}, + []string{CreateSnapshot, Manage, ManageILM, ManageRoleup, Monitor, ReadSecurity}, []DBPrivileges{ { []string{PrivilegeIndexAny}, From 521251dcf23b8e6d7df9437450ce96a0ad6089fe Mon Sep 17 00:00:00 2001 From: Pritam Date: Tue, 25 Jul 2023 16:15:08 +0600 Subject: [PATCH 23/24] Removed read_security from cluster privileges Signed-off-by: Pritam --- elasticsearch/api.go | 3 +-- elasticsearch/es_client_v7.go | 2 +- elasticsearch/es_client_v8.go | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/elasticsearch/api.go b/elasticsearch/api.go index 3c8f18af6..31aab3c41 100644 --- a/elasticsearch/api.go +++ b/elasticsearch/api.go @@ -33,14 +33,13 @@ var ( PrivilegeWrite = "write" PrivilegeCreateIndex = "create_index" PrivilegeIndexAny = "*" - ClusterAccessAll = "all" ApplicationKibana = "kibana-.kibana" CreateSnapshot = "create_snapshot" Manage = "manage" ManageILM = "manage_ilm" ManageRoleup = "manage_rollup" Monitor = "monitor" - ReadSecurity = "read_security" + ManageCCR = "manage_ccr" ) type DBPrivileges struct { diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index 7f82941bd..0a3628564 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -330,7 +330,7 @@ func (es *ESClientV7) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV7) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{CreateSnapshot, Manage, ManageILM, ManageRoleup, Monitor, ReadSecurity}, + []string{CreateSnapshot, Manage, ManageILM, ManageRoleup, Monitor, ManageCCR}, []DBPrivileges{ { []string{PrivilegeIndexAny}, diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index 225438e32..4bdadcb3e 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -329,7 +329,7 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{CreateSnapshot, Manage, ManageILM, ManageRoleup, Monitor, ReadSecurity}, + []string{CreateSnapshot, Manage, ManageILM, ManageRoleup, Monitor, ManageCCR}, []DBPrivileges{ { []string{PrivilegeIndexAny}, From 3025d623692bafaac5c1213f5a410c7e0e1e11ba Mon Sep 17 00:00:00 2001 From: Pritam Date: Tue, 25 Jul 2023 17:55:46 +0600 Subject: [PATCH 24/24] Updated constant names. Signed-off-by: Pritam --- elasticsearch/api.go | 35 +++++++++++++++++++---------------- elasticsearch/es_client_v7.go | 2 +- elasticsearch/es_client_v8.go | 2 +- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/elasticsearch/api.go b/elasticsearch/api.go index 31aab3c41..34fc23356 100644 --- a/elasticsearch/api.go +++ b/elasticsearch/api.go @@ -24,22 +24,25 @@ import ( core "k8s.io/api/core/v1" ) -var ( - writeRequestIndex = "kubedb-system" - writeRequestID = "info" - writeRequestType = "_doc" - CustomRoleName = "readWriteAnyDatabase" - PrivilegeRead = "read" - PrivilegeWrite = "write" - PrivilegeCreateIndex = "create_index" - PrivilegeIndexAny = "*" - ApplicationKibana = "kibana-.kibana" - CreateSnapshot = "create_snapshot" - Manage = "manage" - ManageILM = "manage_ilm" - ManageRoleup = "manage_rollup" - Monitor = "monitor" - ManageCCR = "manage_ccr" +const ( + writeRequestIndex = "kubedb-system" + writeRequestID = "info" + writeRequestType = "_doc" + CustomRoleName = "readWriteAnyDatabase" + ApplicationKibana = "kibana-.kibana" +) + +const ( + PrivilegeCreateSnapshot = "create_snapshot" + PrivilegeManage = "manage" + PrivilegeManageILM = "manage_ilm" + PrivilegeManageRoleup = "manage_rollup" + PrivilegeMonitor = "monitor" + PrivilegeManageCCR = "manage_ccr" + PrivilegeRead = "read" + PrivilegeWrite = "write" + PrivilegeCreateIndex = "create_index" + PrivilegeIndexAny = "*" ) type DBPrivileges struct { diff --git a/elasticsearch/es_client_v7.go b/elasticsearch/es_client_v7.go index 0a3628564..0d5b7d119 100644 --- a/elasticsearch/es_client_v7.go +++ b/elasticsearch/es_client_v7.go @@ -330,7 +330,7 @@ func (es *ESClientV7) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV7) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{CreateSnapshot, Manage, ManageILM, ManageRoleup, Monitor, ManageCCR}, + []string{PrivilegeCreateSnapshot, PrivilegeManage, PrivilegeManageILM, PrivilegeManageRoleup, PrivilegeMonitor, PrivilegeManageCCR}, []DBPrivileges{ { []string{PrivilegeIndexAny}, diff --git a/elasticsearch/es_client_v8.go b/elasticsearch/es_client_v8.go index 4bdadcb3e..d7eb237c6 100644 --- a/elasticsearch/es_client_v8.go +++ b/elasticsearch/es_client_v8.go @@ -329,7 +329,7 @@ func (es *ESClientV8) GetDBUserRole(ctx context.Context) (error, bool) { func (es *ESClientV8) CreateDBUserRole(ctx context.Context) error { userRoleReqStruct := UserRoleReq{ - []string{CreateSnapshot, Manage, ManageILM, ManageRoleup, Monitor, ManageCCR}, + []string{PrivilegeCreateSnapshot, PrivilegeManage, PrivilegeManageILM, PrivilegeManageRoleup, PrivilegeMonitor, PrivilegeManageCCR}, []DBPrivileges{ { []string{PrivilegeIndexAny},