Skip to content

Commit

Permalink
Merge pull request #100 from yuvipanda/typo-fix
Browse files Browse the repository at this point in the history
Fix typo in make_pod
  • Loading branch information
minrk committed Nov 24, 2017
2 parents 672d556 + bd09353 commit 06f3d6c
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions kubespawner/spawner.py
Original file line number Diff line number Diff line change
Expand Up @@ -610,12 +610,12 @@ def _hub_connect_port_default(self):
config=True,
help="""
Extra configuration (e.g. envFrom) for notebook container which is not covered by other attributes.
This dict will be directly merge into `container` of notebook server,
so you should use the same structure. Each item in the dict is field of container configuration
which follows spec at https://v1-6.docs.kubernetes.io/docs/api-reference/v1.6/#container-v1-core.
One usage is set envFrom on notebook container with configuration below:
One usage is set envFrom on notebook container with configuration below:
envFrom: [
{
configMapRef: {
Expand All @@ -624,7 +624,7 @@ def _hub_connect_port_default(self):
}
]
The key could be either camelcase word (used by Kubernetes yaml, e.g. envFrom)
The key could be either camelcase word (used by Kubernetes yaml, e.g. envFrom)
or underscore-separated word (used by kubernetes python client, e.g. env_from).
"""
)
Expand All @@ -634,15 +634,15 @@ def _hub_connect_port_default(self):
config=True,
help="""
Extra configuration (e.g. tolerations) for the pod which is not covered by other attributes.
This dict will be directly merge into pod,so you should use the same structure.
This dict will be directly merge into pod,so you should use the same structure.
Each item in the dict is field of pod configuration
which follows spec at https://v1-6.docs.kubernetes.io/docs/api-reference/v1.6/#podspec-v1-core.
One usage is set dnsPolicy with configuration below:
dnsPolicy: ClusterFirstWithHostNet
One usage is set dnsPolicy with configuration below:
dnsPolicy: ClusterFirstWithHostNet
The key could be either camelcase word (used by Kubernetes yaml, e.g. dnsPolicy)
The key could be either camelcase word (used by Kubernetes yaml, e.g. dnsPolicy)
or underscore-separated word (used by kubernetes python client, e.g. dns_policy).
"""
)
Expand Down Expand Up @@ -768,7 +768,7 @@ def get_pod_manifest(self):
service_account=self.singleuser_service_account,
extra_container_config=self.singleuser_extra_container_config,
extra_pod_config=self.singleuser_extra_pod_config,
extra_containes=self.singleuser_extra_containers
extra_containers=self.singleuser_extra_containers
)

def get_pvc_manifest(self):
Expand Down

0 comments on commit 06f3d6c

Please sign in to comment.