Skip to content

Commit

Permalink
Remove registry-proxy (kubernetes-sigs#8327)
Browse files Browse the repository at this point in the history
  • Loading branch information
zhengtianbao authored and sakuraiyuta committed Apr 16, 2022
1 parent c8659c4 commit 1a5f9ac
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 142 deletions.
11 changes: 0 additions & 11 deletions roles/download/defaults/main.yml
Expand Up @@ -704,8 +704,6 @@ dnsautoscaler_image_tag: "{{ dnsautoscaler_version }}"

registry_image_repo: "{{ docker_image_repo }}/library/registry"
registry_image_tag: "2.7.1"
registry_proxy_image_repo: "{{ kube_image_repo }}/kube-registry-proxy"
registry_proxy_image_tag: "0.4"
metrics_server_version: "v0.5.0"
metrics_server_image_repo: "{{ kube_image_repo }}/metrics-server/metrics-server"
metrics_server_image_tag: "{{ metrics_server_version }}"
Expand Down Expand Up @@ -1232,15 +1230,6 @@ downloads:
groups:
- kube_node

registry_proxy:
enabled: "{{ registry_enabled }}"
container: true
repo: "{{ registry_proxy_image_repo }}"
tag: "{{ registry_proxy_image_tag }}"
sha256: "{{ registry_proxy_digest_checksum|default(None) }}"
groups:
- kube_node

metrics_server:
enabled: "{{ metrics_server_enabled }}"
container: true
Expand Down
7 changes: 1 addition & 6 deletions roles/kubernetes-apps/registry/tasks/main.yml
Expand Up @@ -38,23 +38,18 @@
registry_templates:
- { name: registry-ns, file: registry-ns.yml, type: ns }
- { name: registry-sa, file: registry-sa.yml, type: sa }
- { name: registry-proxy-sa, file: registry-proxy-sa.yml, type: sa }
- { name: registry-svc, file: registry-svc.yml, type: svc }
- { name: registry-secrets, file: registry-secrets.yml, type: secrets }
- { name: registry-cm, file: registry-cm.yml, type: cm }
- { name: registry-rs, file: registry-rs.yml, type: rs }
- { name: registry-proxy-ds, file: registry-proxy-ds.yml, type: ds }
registry_templates_for_psp:
- { name: registry-psp, file: registry-psp.yml, type: psp }
- { name: registry-cr, file: registry-cr.yml, type: clusterrole }
- { name: registry-crb, file: registry-crb.yml, type: rolebinding }
- { name: registry-proxy-psp, file: registry-proxy-psp.yml, type: psp }
- { name: registry-proxy-cr, file: registry-proxy-cr.yml, type: clusterrole }
- { name: registry-proxy-crb, file: registry-proxy-crb.yml, type: rolebinding }

- name: Registry | Append extra templates to Registry Templates list for PodSecurityPolicy
set_fact:
registry_templates: "{{ registry_templates[:3] + registry_templates_for_psp + registry_templates[3:] }}"
registry_templates: "{{ registry_templates[:2] + registry_templates_for_psp + registry_templates[2:] }}"
when:
- podsecuritypolicy_enabled
- registry_namespace != "kube-system"
Expand Down
15 changes: 0 additions & 15 deletions roles/kubernetes-apps/registry/templates/registry-proxy-cr.yml.j2

This file was deleted.

13 changes: 0 additions & 13 deletions roles/kubernetes-apps/registry/templates/registry-proxy-crb.yml.j2

This file was deleted.

36 changes: 0 additions & 36 deletions roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2

This file was deleted.

56 changes: 0 additions & 56 deletions roles/kubernetes-apps/registry/templates/registry-proxy-psp.yml.j2

This file was deleted.

This file was deleted.

0 comments on commit 1a5f9ac

Please sign in to comment.