change to run rekcurd on EKS #51
Conversation
yuki-mt
requested review from
sugyan,
yoquankara,
yustoris,
jkw552403,
keigohtr and
shimpei-yotsukura
| if i.metadata.labels.get("drucker-worker", "False") == "True": | ||
| application_name = i.metadata.labels["app"] | ||
| labels = i.metadata.labels | ||
| if labels is not None and labels.get("drucker-worker", "False") == "True": |
There was a problem hiding this comment.
In the new kubernetes-client version, labels can be None, so I check here.
| @@ -313,10 +314,11 @@ def update_dbs_kubernetes(kubernetes_id:int, applist:set=None, description:str=N | |||
| db.session.flush() | |||
| """Service""" | |||
| for i in ret.items: | |||
| if i.metadata.labels.get("drucker-worker", "False") == "False": | |||
| labels = i.metadata.labels | |||
| if labels is None or labels.get("drucker-worker", "False") == "False": | |||
app/Dockerfile
Outdated
| RUN set -x && \ | ||
| dist=/usr/local/bin/aws-iam-authenticator && \ | ||
| curl -o $dist https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/aws-iam-authenticator && \ | ||
| chmod +x $dist |
There was a problem hiding this comment.
Please create another Dockerfile since this configuration is only for AWS env.
| @@ -26,6 +26,7 @@ services: | |||
| dockerfile: ./app/Dockerfile | |||
| volumes: | |||
| - ../app:/root/drucker-dashboard | |||
| - ~/.aws:/root/.aws | |||
There was a problem hiding this comment.
Please add another docker-compose file since this configuration is only for AWS env.
| @@ -29,6 +29,7 @@ services: | |||
| dockerfile: ./app/Dockerfile | |||
| volumes: | |||
| - ../app:/root/drucker-dashboard | |||
| - ~/.aws:/root/.aws | |||
| @@ -167,7 +167,7 @@ def delete(self, application_id:int, service_id:int): | |||
| v1_service = core_vi.delete_namespaced_service( | |||
| name="{0}-service".format(sobj.service_name), | |||
| namespace=sobj.service_level, | |||
| #body=client.V1DeleteOptions() #FIXME add this after v6.0.0 | |||
| body=client.V1DeleteOptions() | |||
There was a problem hiding this comment.
Did you confirm it works fine on Kubernetes 1.9.
There was a problem hiding this comment.
@keigohtr I confirmed I successfully deployed and deleted a service in Kubernetes 1.9.6 (in minikube)!
|
Great work again! |
|
@keigohtr I separated AWS-specific Dockerfile and docker-compose YAML files. |
README.md
Outdated
| @@ -25,22 +25,32 @@ https://github.com/drucker/drucker-parent | |||
| $ git clone https://github.com/drucker/drucker-dashboard.git drucker-dashboard | |||
| ``` | |||
|
|
|||
| ## Preparation for AWS setting | |||
| ## Run it! | |||
| ### For non-AWS users | |||
There was a problem hiding this comment.
x For non-AWS users
o General users
What is this PR for?
To be able to add EKS as Kubernetes Host
This PR includes
aws-iam-authenticatorcommand in backend DockerfileWhat type of PR is it?
Feature
What is the issue?
N/A
How should this be tested?
docker-compose -f docker-compose/docker-compose.develop.yaml up