Skip to content

Commit 54f414a

Browse files
author
lijianguo
committed
Merge remote-tracking branch 'upstream/master'
2 parents dd084c4 + 848084b commit 54f414a

22 files changed

Lines changed: 88 additions & 88 deletions

File tree

‎charts/controller/templates/controller-deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ spec:
7777
- name: "IMAGE_PULL_POLICY"
7878
value: "{{ .Values.app_pull_policy }}"
7979
{{- if (.Values.app_storage_class) }}
80-
- name: "DRYCC_APP_KUBERNETES_STORAGE_CLASS"
80+
- name: "DRYCC_APP_STORAGE_CLASS"
8181
value: "{{ .Values.app_storage_class }}"
8282
{{- end }}
8383
- name: "TZ"

‎rootfs/api/models/app.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,7 @@ def create(self, *args, **kwargs): # noqa
267267
)
268268

269269
# create required minimum resources in k8s for the application
270-
namespace = service = self.id
271-
quota_name = '{}-quota'.format(self.id)
270+
namespace = quota_name = service = self.id
272271
try:
273272
self.log('creating Namespace {} and services'.format(namespace), level=logging.DEBUG)
274273
# Create essential resources

‎rootfs/api/models/resource.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def save(self, *args, **kwargs):
4242

4343
def attach(self, *args, **kwargs):
4444
try:
45-
self._scheduler.servicecatalog.get_instance(self.app.id, self.name)
45+
self._scheduler.svcat.get_instance(self.app.id, self.name)
4646
err = "Resource {} already exists in this namespace".format(self.name) # noqa
4747
self.log(err, logging.INFO)
4848
raise AlreadyExists(err)
@@ -55,7 +55,7 @@ def attach(self, *args, **kwargs):
5555
"instance_plan": ":".join(instance[1:]),
5656
"parameters": self.options,
5757
}
58-
self._scheduler.servicecatalog.create_instance(
58+
self._scheduler.svcat.create_instance(
5959
self.app.id, self.name, **kwargs
6060
)
6161
data = {
@@ -80,8 +80,8 @@ def delete(self, *args, **kwargs):
8080
def detach(self, *args, **kwargs):
8181
try:
8282
# We raise an exception when a resource doesn't exist
83-
self._scheduler.servicecatalog.get_instance(self.app.id, self.name)
84-
self._scheduler.servicecatalog.delete_instance(self.app.id, self.name)
83+
self._scheduler.svcat.get_instance(self.app.id, self.name)
84+
self._scheduler.svcat.delete_instance(self.app.id, self.name)
8585
except KubeException as e:
8686
raise ServiceUnavailable("Could not delete resource {} for application {}".format(self.name, self.app_id)) from e # noqa
8787

@@ -102,14 +102,14 @@ def bind(self, *args, **kwargs):
102102
if self.binding == "Ready":
103103
raise DryccException("the resource is binding")
104104
try:
105-
self._scheduler.servicecatalog.get_binding(self.app.id, self.name)
105+
self._scheduler.svcat.get_binding(self.app.id, self.name)
106106
err = "Resource {} is binding".format(self.name)
107107
self.log(err, logging.INFO)
108108
raise AlreadyExists(err)
109109
except KubeException as e:
110110
logger.info(e)
111111
try:
112-
self._scheduler.servicecatalog.create_binding(
112+
self._scheduler.svcat.create_binding(
113113
self.app.id, self.name, **kwargs)
114114
data = {
115115
"task_id": uuid.uuid4().hex,
@@ -126,8 +126,8 @@ def unbind(self, *args, **kwargs):
126126
raise DryccException("the resource is not binding")
127127
try:
128128
# We raise an exception when a resource doesn't exist
129-
self._scheduler.servicecatalog.get_binding(self.app.id, self.name)
130-
self._scheduler.servicecatalog.delete_binding(self.app.id, self.name)
129+
self._scheduler.svcat.get_binding(self.app.id, self.name)
130+
self._scheduler.svcat.delete_binding(self.app.id, self.name)
131131
self.binding = None
132132
self.data = {}
133133
self.save()
@@ -136,7 +136,7 @@ def unbind(self, *args, **kwargs):
136136

137137
def attach_update(self, *args, **kwargs):
138138
try:
139-
data = self._scheduler.servicecatalog.get_instance(
139+
data = self._scheduler.svcat.get_instance(
140140
self.app.id, self.name).json()
141141
except KubeException as e:
142142
self.DryccException("resource {} does not exist".format(self.name))
@@ -149,7 +149,7 @@ def attach_update(self, *args, **kwargs):
149149
"parameters": self.options,
150150
"external_id": data["spec"]["externalID"]
151151
}
152-
self._scheduler.servicecatalog.put_instance(
152+
self._scheduler.svcat.put_instance(
153153
self.app.id, self.name, version, **kwargs
154154
)
155155
data = {
@@ -166,7 +166,7 @@ def retrieve(self, *args, **kwargs):
166166
update_flag = False
167167
if self.status != "Ready":
168168
try:
169-
resp_i = self._scheduler.servicecatalog.get_instance(
169+
resp_i = self._scheduler.svcat.get_instance(
170170
self.app.id, self.name).json()
171171
self.status = resp_i.get('status', {}).\
172172
get('lastConditionState')
@@ -177,7 +177,7 @@ def retrieve(self, *args, **kwargs):
177177
if self.binding != "Ready":
178178
try:
179179
# We raise an exception when a resource doesn't exist
180-
resp_b = self._scheduler.servicecatalog.get_binding(
180+
resp_b = self._scheduler.svcat.get_binding(
181181
self.app.id, self.name).json()
182182
self.binding = resp_b.get('status', {}).\
183183
get('lastConditionState')
@@ -200,12 +200,12 @@ def retrieve(self, *args, **kwargs):
200200
def detach_resource(self, *args, **kwargs):
201201
if self.binding != "Ready":
202202
try:
203-
resp_b = self._scheduler.servicecatalog.get_binding(
203+
resp_b = self._scheduler.svcat.get_binding(
204204
self.app.id, self.name).json()
205205
secret_name = resp_b.get('spec', {}).get('secretName')
206206
if secret_name:
207207
self._scheduler.secret.delete(self.app.id, secret_name)
208-
self._scheduler.servicecatalog.delete_binding(
208+
self._scheduler.svcat.delete_binding(
209209
self.app.id, self.name)
210210
except KubeException as e:
211211
logger.info("delete binding info error: {}".format(e))

‎rootfs/api/models/volume.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def __str__(self):
2929
def save(self, *args, **kwargs):
3030
# Attach volume, updates k8s
3131
if self.created == self.updated:
32-
self.attach(*args, **kwargs)
32+
self.attach()
3333
# Save to DB
3434
return super(Volume, self).save(*args, **kwargs)
3535

@@ -38,11 +38,11 @@ def delete(self, *args, **kwargs):
3838
if self.path:
3939
raise DryccException("the volume is not unmounted")
4040
# Deatch volume, updates k8s
41-
self.detach(*args, **kwargs)
41+
self.detach()
4242
# Delete from DB
4343
return super(Volume, self).delete(*args, **kwargs)
4444

45-
def attach(self, *args, **kwargs):
45+
def attach(self):
4646
try:
4747
self._scheduler.pvc.get(self.app.id, self.name)
4848
err = "Volume {} already exists in this namespace".format(self.name) # noqa
@@ -52,15 +52,16 @@ def attach(self, *args, **kwargs):
5252
logger.info(e)
5353
try:
5454
kwargs = {
55-
"size": self.size
55+
"size": self.size,
56+
"storage_class": settings.DRYCC_APP_STORAGE_CLASS,
5657
}
5758
self._scheduler.pvc.create(self.app.id, self.name, **kwargs)
5859
except KubeException as e:
5960
msg = 'There was a problem creating the volume ' \
6061
'{} for {}'.format(self.name, self.app_id)
6162
raise ServiceUnavailable(msg) from e
6263

63-
def detach(self, *args, **kwargs):
64+
def detach(self):
6465
try:
6566
# We raise an exception when a volume doesn't exist
6667
self._scheduler.pvc.get(self.app.id, self.name)

‎rootfs/api/settings/production.py‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
LOGGING = {
174174
'version': 1,
175175
'disable_existing_loggers': False,
176-
'root': {'level': 'DEBUG' if DEBUG else 'INFO'},
176+
'root': {'level': 'DEBUG' if DEBUG else 'WARN'},
177177
'formatters': {
178178
'verbose': {
179179
'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
@@ -326,7 +326,7 @@
326326

327327
DRYCC_DEPLOY_HOOK_SECRET_KEY = os.environ.get('DRYCC_DEPLOY_HOOK_SECRET_KEY', None)
328328

329-
DRYCC_APP_KUBERNETES_STORAGE_CLASS = os.environ.get('DRYCC_APP_KUBERNETES_STORAGE_CLASS', "") # noqa
329+
DRYCC_APP_STORAGE_CLASS = os.environ.get('DRYCC_APP_STORAGE_CLASS', "")
330330

331331
KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT = os.environ.get('KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT', None) # noqa
332332

@@ -340,12 +340,14 @@
340340
'KUBERNETES_POD_DEFAULT_RESOURCES',
341341
json.dumps({
342342
"requests": {
343-
"cpu": "256m",
344-
"memory": "256Mi"
343+
"cpu": "200m",
344+
"memory": "256Mi",
345+
"ephemeral-storage": "1Gi"
345346
},
346347
"limits": {
347-
"cpu": "512m",
348-
"memory": "512Mi"
348+
"cpu": "500m",
349+
"memory": "512Mi",
350+
"ephemeral-storage": "2Gi"
349351
},
350352
})
351353
)
@@ -355,11 +357,11 @@
355357
'KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC',
356358
json.dumps({
357359
"hard": {
358-
"cpu": "8",
359-
"pods": "16",
360-
"memory": "32Gi",
361-
"ephemeral-storage": "1Gi",
362-
"requests.storage": "10Gi",
360+
"cpu": "64",
361+
"pods": "64",
362+
"memory": "128Gi",
363+
"ephemeral-storage": "64Gi",
364+
"requests.storage": "256Gi",
363365
"persistentvolumeclaims": 8,
364366
}
365367
})

‎rootfs/api/settings/testing.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
DRYCC_DEFAULT_CONFIG_TAGS = os.environ.get('DRYCC_DEFAULT_CONFIG_TAGS', '')
4444

45-
DRYCC_APP_KUBERNETES_STORAGE_CLASS = os.environ.get('DRYCC_APP_KUBERNETES_STORAGE_CLASS', '') # noqa
45+
DRYCC_APP_STORAGE_CLASS = os.environ.get('DRYCC_APP_STORAGE_CLASS', '')
4646

4747

4848
class DisableMigrations(object):

‎rootfs/api/tests/test_volume.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ def test_volumecreate(self, mock_requests):
3636

3737
response = self.client.post(
3838
'/v2/apps/{}/volumes'.format(app_id),
39-
data={'name': 'myvolume', 'size': '500M'}
39+
data={
40+
'name': 'myvolume', 'size': '500M'
41+
}
4042
)
4143
self.assertEqual(response.status_code, 201, response.data)
4244

‎rootfs/drycc/gunicorn/wsgi.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
from tornado.wsgi import WSGIContainer
2-
3-
42
from api.wsgi import application as handler
53

6-
74
application = WSGIContainer(handler)

‎rootfs/drycc/wsgi.py‎

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

rootfs/scheduler/resources/horizontalpodautoscaler.py renamed to rootfs/scheduler/resources/hpa.py

File renamed without changes.

0 commit comments

Comments
 (0)