Skip to content

Commit 3f1f77c

Browse files
authored
Merge branch 'kubernetes:master' into feature/kubelet_statusz_endpoint
2 parents 19a4276 + 1e04b17 commit 3f1f77c

File tree

504 files changed

+22698
-11670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

504 files changed

+22698
-11670
lines changed

LICENSES/vendor/github.com/google/shlex/LICENSE

Lines changed: 0 additions & 206 deletions
This file was deleted.

api/discovery/aggregated_v2.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,6 +1257,29 @@
12571257
"update",
12581258
"watch"
12591259
]
1260+
},
1261+
{
1262+
"resource": "volumeattributesclasses",
1263+
"responseKind": {
1264+
"group": "",
1265+
"kind": "VolumeAttributesClass",
1266+
"version": ""
1267+
},
1268+
"scope": "Cluster",
1269+
"shortNames": [
1270+
"vac"
1271+
],
1272+
"singularResource": "volumeattributesclass",
1273+
"verbs": [
1274+
"create",
1275+
"delete",
1276+
"deletecollection",
1277+
"get",
1278+
"list",
1279+
"patch",
1280+
"update",
1281+
"watch"
1282+
]
12601283
}
12611284
],
12621285
"version": "v1"

api/discovery/apis__storage.k8s.io__v1.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,26 @@
101101
"patch",
102102
"update"
103103
]
104+
},
105+
{
106+
"kind": "VolumeAttributesClass",
107+
"name": "volumeattributesclasses",
108+
"namespaced": false,
109+
"shortNames": [
110+
"vac"
111+
],
112+
"singularName": "volumeattributesclass",
113+
"storageVersionHash": "Bl3MtjZ/n/s=",
114+
"verbs": [
115+
"create",
116+
"delete",
117+
"deletecollection",
118+
"get",
119+
"list",
120+
"patch",
121+
"update",
122+
"watch"
123+
]
104124
}
105125
]
106126
}

0 commit comments

Comments
 (0)