-
Notifications
You must be signed in to change notification settings - Fork 549
docker cache deploy #5290
docker cache deploy #5290
Conversation
@@ -9,6 +9,61 @@ | |||
logger = get_logger(__name__) | |||
|
|||
|
|||
def get_docker_cache_config_and_mirrors(layout, cluster_config): | |||
""" | |||
generate hived config from layout.yaml and config.yaml |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These comments are incorrect.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed
@@ -9,6 +9,61 @@ | |||
logger = get_logger(__name__) | |||
|
|||
|
|||
def get_docker_cache_config_and_mirrors(layout, cluster_config): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this function can be removed. During installation, using config.yml + services-configuration.yaml.template is enough.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed
@@ -233,6 +233,61 @@ def get_hived_config(layout, cluster_config): | |||
return { "skus": skus } | |||
|
|||
|
|||
def get_docker_cache_config_and_mirrors(layout, cluster_config): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this function can be removed. During installation, using config.yml + services-configuration.yaml.template is enough.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed
service_port: 5000 | ||
service_nodeport: 30500 | ||
remote_url: https://registry-1.docker.io | ||
registry-htpasswd: dGVzdDokMnkkMDUkRUZiaWphaHovMHl4UC5xMFk1VW52TzljU2hHMThCRzM3QzBHNFhoRmFtTXdTUXdQLjBqQi4KCg== |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it a default passwd? What is the exact meaning of this string?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's test test processed by htpasswd tool and base64 encoded, commented out in new commit.
src/drivers/deploy/service.yaml
Outdated
@@ -20,6 +20,7 @@ cluster-type: | |||
|
|||
prerequisite: | |||
- cluster-configuration | |||
- drivers |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove this.
You can ignore services with cluster-type: yarn
because they are not supported now.
src/zookeeper/deploy/service.yaml
Outdated
@@ -20,6 +20,7 @@ cluster-type: | |||
|
|||
prerequisite: | |||
- cluster-configuration | |||
- docker-cache |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can ignore services with cluster-type: yarn
because they are not supported now.
contrib/kubespray/quick-start/services-configuration.yaml.template
Outdated
Show resolved
Hide resolved
- name: run add_docker_cache_config.py script to add docker cache config | ||
ansible.builtin.command: | ||
argv: | ||
- sudo |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I notice there's "become: true" already. So you can remove this sudo.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, I will update this
close #5219