From 78ba5f8d9e0ba12784d74e1e290de6d38695ec97 Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Fri, 30 Nov 2018 13:35:03 +0100
Subject: [PATCH] OSBS: authoritative_registry in osbs.conf is deprecated

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 playbooks/groups/osbs-cluster.yml                              | 2 --
 roles/osbs-client/defaults/main.yml                            | 3 +--
 roles/osbs-client/templates/osbs.conf.j2                       | 2 --
 roles/osbs-namespace/defaults/main.yml                         | 1 -
 roles/osbs-namespace/templates/client-config-secret.conf.j2    | 1 -
 .../tests/files/expected-client-config-secret.conf             | 2 --
 6 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 78cd91ee21..48d2dfa0f6 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -308,7 +308,6 @@
       osbs_namespace: "{{ osbs_worker_namespace }}"
       osbs_service_accounts: "{{ osbs_worker_service_accounts }}"
       osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}"
-      osbs_authoritative_registry: "{{ source_registry }}"
       osbs_sources_command: "{{ osbs_conf_sources_command }}"
 
 - name: setup ODCS secret in worker namespace
@@ -335,7 +334,6 @@
     osbs_worker_clusters: "{{ osbs_conf_worker_clusters }}"
     osbs_cpu_limitrange: "{{ osbs_orchestrator_cpu_limitrange }}"
     osbs_nodeselector: "{{ osbs_orchestrator_default_nodeselector|default('') }}"
-    osbs_authoritative_registry: "{{ source_registry }}"
     osbs_sources_command: "{{ osbs_conf_sources_command }}"
     osbs_readwrite_users: "{{ osbs_conf_readwrite_users }}"
     osbs_service_accounts: "{{ osbs_conf_service_accounts }}"
diff --git a/roles/osbs-client/defaults/main.yml b/roles/osbs-client/defaults/main.yml
index 0ba1d38f0b..43ed4857e8 100644
--- a/roles/osbs-client/defaults/main.yml
+++ b/roles/osbs-client/defaults/main.yml
@@ -23,7 +23,6 @@ default:
   build_type: prod
   registry_uri: https://osbs.localdomain:5000/v2
   source_registry_uri: https://osbs.localdomain:5000/v2
-  authoritative_registry: registry.example.com
   vendor: Fedora Project
   build_host: osbs.localdomain
   verify_ssl: false
@@ -45,4 +44,4 @@ default:
   builder_odcs_openidc_secret: ""
   builder_pdc_url: ""
   builder_pdc_insecure: true
-  flatpak_base_image: ""
\ No newline at end of file
+  flatpak_base_image: ""
diff --git a/roles/osbs-client/templates/osbs.conf.j2 b/roles/osbs-client/templates/osbs.conf.j2
index a444e89f12..ba59251aec 100644
--- a/roles/osbs-client/templates/osbs.conf.j2
+++ b/roles/osbs-client/templates/osbs.conf.j2
@@ -68,7 +68,6 @@ sources_command = {{ default.sources_command }}
 build_type = {{ default.build_type }}
 registry_uri = {{ default.registry_uri }}
 source_registry_uri = {{ default.source_registry_uri }}
-authoritative_registry = {{ default.authoritative_registry }}
 vendor = {{ default.vendor }}
 build_host = {{ default.build_host }}
 verify_ssl = {{ default.verify_ssl }}
@@ -162,7 +161,6 @@ sources_command = {{ default.sources_command }}
 build_type = {{ default.build_type }}
 registry_uri = {{ default.registry_uri }}
 source_registry_uri = {{ default.source_registry_uri }}
-authoritative_registry = {{ default.authoritative_registry }}
 vendor = {{ default.vendor }}
 build_host = {{ default.build_host }}
 verify_ssl = {{ default.verify_ssl }}
diff --git a/roles/osbs-namespace/defaults/main.yml b/roles/osbs-namespace/defaults/main.yml
index 91e5804978..b717b38588 100644
--- a/roles/osbs-namespace/defaults/main.yml
+++ b/roles/osbs-namespace/defaults/main.yml
@@ -25,7 +25,6 @@ osbs_orchestrator: false
 osbs_worker_clusters: {}
 
 osbs_distribution_scope: public
-osbs_authoritative_registry: registry.fedoraproject.org
 osbs_koji_hub: ''
 osbs_koji_root: ''
 osbs_pulp_registry_name: ''
diff --git a/roles/osbs-namespace/templates/client-config-secret.conf.j2 b/roles/osbs-namespace/templates/client-config-secret.conf.j2
index 0144663b5d..a63908d8a5 100644
--- a/roles/osbs-namespace/templates/client-config-secret.conf.j2
+++ b/roles/osbs-namespace/templates/client-config-secret.conf.j2
@@ -13,7 +13,6 @@ verify_ssl = {{ cluster.verify_ssl | default('true') }}
 auto_build_node_selector = {{ cluster.auto_build_node_selector }}
 {% endif %}
 
-authoritative_registry = {{ osbs_authoritative_registry }}
 distribution_scope = {{ osbs_distribution_scope }}
 
 # Koji integration
diff --git a/roles/osbs-namespace/tests/files/expected-client-config-secret.conf b/roles/osbs-namespace/tests/files/expected-client-config-secret.conf
index 77749b26a1..c4941c4358 100644
--- a/roles/osbs-namespace/tests/files/expected-client-config-secret.conf
+++ b/roles/osbs-namespace/tests/files/expected-client-config-secret.conf
@@ -8,7 +8,6 @@ token_file = /var/run/secrets/atomic-reactor/minimum-orchestrator/token
 use_auth = true
 verify_ssl = false
 
-authoritative_registry = registry.fedoraproject.org
 distribution_scope = public
 
 # Koji integration
@@ -31,7 +30,6 @@ use_auth = false
 verify_ssl = false
 auto_build_node_selector = auto_build=true
 
-authoritative_registry = registry.fedoraproject.org
 distribution_scope = public
 
 # Koji integration