Skip to content

K
k3s
Commit 87526da3 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #32198 from deads2k/storage-01-make-easier-to-inspect

Automatic merge from submit-queue add logging for enabled/disabled API Groups Adds logging to the apiserver to indicate which API groups are enabled and disabled as go through. This will make it easier to identify what's gone wrong in cases where the API server is down during diagnoses and the config is inaccessible, like in GKE tests. For example https://github.com/kubernetes/kubernetes/issues/32185#issuecomment-245255700 . @wojtek-t This may have made the problem more obvious.
parents 8b5317bf 0e37530b
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 7 deletions
examples/experimental/persistent-volume-provisioning/README.md
View file @ 87526da3
...@@ -51,7 +51,7 @@ The name of a StorageClass object is significant, and is how users can request a ...@@ -51,7 +51,7 @@ The name of a StorageClass object is significant, and is how users can request a
```yaml ```yaml
kind: StorageClass kind: StorageClass
apiVersion: extensions/v1beta1 apiVersion: storage.k8s.io/v1beta1
metadata: metadata:
name: slow name: slow
provisioner: kubernetes.io/aws-ebs provisioner: kubernetes.io/aws-ebs
...@@ -71,7 +71,7 @@ parameters: ...@@ -71,7 +71,7 @@ parameters:
```yaml ```yaml
kind: StorageClass kind: StorageClass
apiVersion: extensions/v1beta1 apiVersion: storage.k8s.io/v1beta1
metadata: metadata:
name: slow name: slow
provisioner: kubernetes.io/gce-pd provisioner: kubernetes.io/gce-pd
...@@ -86,7 +86,7 @@ parameters: ...@@ -86,7 +86,7 @@ parameters:
#### GLUSTERFS #### GLUSTERFS
```yaml ```yaml
apiVersion: extensions/v1beta1 apiVersion: storage.k8s.io/v1beta1
kind: StorageClass kind: StorageClass
metadata: metadata:
name: slow name: slow
...@@ -109,7 +109,7 @@ parameters: ...@@ -109,7 +109,7 @@ parameters:
```yaml ```yaml
kind: StorageClass kind: StorageClass
apiVersion: extensions/v1beta1 apiVersion: storage.k8s.io/v1beta1
metadata: metadata:
name: gold name: gold
provisioner: kubernetes.io/cinder provisioner: kubernetes.io/cinder
......
examples/experimental/persistent-volume-provisioning/aws-ebs.yaml
View file @ 87526da3
kind: StorageClass kind: StorageClass
apiVersion: extensions/v1beta1 apiVersion: storage.k8s.io/v1beta1
metadata: metadata:
name: slow name: slow
provisioner: kubernetes.io/aws-ebs provisioner: kubernetes.io/aws-ebs
......
examples/experimental/persistent-volume-provisioning/gce-pd.yaml
View file @ 87526da3
kind: StorageClass kind: StorageClass
apiVersion: extensions/v1beta1 apiVersion: storage.k8s.io/v1beta1
metadata: metadata:
name: slow name: slow
provisioner: kubernetes.io/gce-pd provisioner: kubernetes.io/gce-pd
......
examples/experimental/persistent-volume-provisioning/glusterfs-dp.yaml
View file @ 87526da3
apiVersion: extensions/v1beta1 apiVersion: storage.k8s.io/v1beta1
kind: StorageClass kind: StorageClass
metadata: metadata:
name: slow name: slow
......
pkg/master/master.go
View file @ 87526da3
...@@ -297,13 +297,16 @@ func (m *Master) InstallAPIs(c *Config) { ...@@ -297,13 +297,16 @@ func (m *Master) InstallAPIs(c *Config) {
// TODO find a better way to configure priority of groups // TODO find a better way to configure priority of groups
for _, group := range sets.StringKeySet(c.RESTStorageProviders).List() { for _, group := range sets.StringKeySet(c.RESTStorageProviders).List() {
if !c.APIResourceConfigSource.AnyResourcesForGroupEnabled(group) { if !c.APIResourceConfigSource.AnyResourcesForGroupEnabled(group) {
glog.V(1).Infof("Skipping disabled API group %q.", group)
continue continue
} }
restStorageBuilder := c.RESTStorageProviders[group] restStorageBuilder := c.RESTStorageProviders[group]
apiGroupInfo, enabled := restStorageBuilder.NewRESTStorage(c.APIResourceConfigSource, restOptionsGetter) apiGroupInfo, enabled := restStorageBuilder.NewRESTStorage(c.APIResourceConfigSource, restOptionsGetter)
if !enabled { if !enabled {
glog.Warningf("Problem initializing API group %q, skipping.", group)
continue continue
} }
glog.V(1).Infof("Enabling API group %q.", group)
// This is here so that, if the policy group is present, the eviction // This is here so that, if the policy group is present, the eviction
// subresource handler wil be able to find poddisruptionbudgets // subresource handler wil be able to find poddisruptionbudgets
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment