Chore: Update k8s.io to v0.33.1 (#105307)

This commit is contained in:
Ryan McKinley
2025-05-28 00:13:18 +03:00
committed by GitHub
parent b11be2f37d
commit d4c446f42c
63 changed files with 689 additions and 524 deletions
+2 -3
View File
@@ -133,7 +133,6 @@ func (c *K8sTestHelper) loadAPIGroups() {
rsp := DoRequest(c, RequestParams{
User: c.Org1.Viewer,
Path: "/apis",
// Accept: "application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json",
}, &metav1.APIGroupList{})
if rsp.Response.StatusCode == http.StatusOK {
@@ -707,7 +706,7 @@ func (c *K8sTestHelper) GetGroupVersionInfoJSON(group string) string {
disco := c.NewDiscoveryClient()
req := disco.RESTClient().Get().
Prefix("apis").
SetHeader("Accept", "application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json")
SetHeader("Accept", "application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList,application/json")
result := req.Do(context.Background())
require.NoError(c.t, result.Error())
@@ -736,7 +735,7 @@ func (c *K8sTestHelper) GetGroupVersionInfoJSON(group string) string {
}
}
require.Fail(c.t, "could not find discovery info for: ", group)
require.Failf(c.t, "could not find discovery info for: %s", group)
return ""
}
@@ -1427,8 +1427,26 @@
"additionalProperties": true
},
"com.github.grafana.grafana-plugin-sdk-go.experimental.apis.data.v0alpha1.DataSourceRef": {
"description": "The datasource",
"type": "object",
"additionalProperties": true
"required": [
"type"
],
"properties": {
"apiVersion": {
"description": "The apiserver version",
"type": "string"
},
"type": {
"description": "The datasource plugin type",
"type": "string"
},
"uid": {
"description": "Datasource UID (NOTE: name in k8s)",
"type": "string"
}
},
"additionalProperties": false
},
"com.github.grafana.grafana.apps.dashboard.pkg.apis.dashboard.v0alpha1.AnnotationActions": {
"type": "object",