From 631c77236b76d0bcd85df61158f1b81592f7228a Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Fri, 30 Nov 2018 13:30:49 +0100
Subject: [PATCH] OSBS: vendor in osbs.conf is deprecated

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 inventory/group_vars/osbs-masters                           | 3 +--
 inventory/group_vars/osbs-masters-stg                       | 3 +--
 playbooks/groups/buildvm.yml                                | 2 --
 playbooks/groups/osbs-cluster.yml                           | 2 --
 roles/osbs-namespace/defaults/main.yml                      | 2 +-
 roles/osbs-namespace/templates/client-config-secret.conf.j2 | 3 ++-
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/inventory/group_vars/osbs-masters b/inventory/group_vars/osbs-masters
index aa6dd7eb9c..a57c398a75 100644
--- a/inventory/group_vars/osbs-masters
+++ b/inventory/group_vars/osbs-masters
@@ -32,7 +32,6 @@ osbs_worker_service_accounts:
 
 
 osbs_conf_sources_command: fedpkg sources
-osbs_conf_vendor: Fedora Project
 
 osbs_orchestrator_cpu_limitrange: "95m"
 
@@ -90,7 +89,7 @@ _osbs_reactor_config_map:
         api_url: "https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1/"
 
     image_labels:
-      vendor: "{{ osbs_conf_vendor }}"
+      vendor: "Fedora Project"
       authoritative-source-url: "{{ source_registry }}"
       distribution-scope: public
 
diff --git a/inventory/group_vars/osbs-masters-stg b/inventory/group_vars/osbs-masters-stg
index 18bd3f5dc4..cc0b4ab0cf 100644
--- a/inventory/group_vars/osbs-masters-stg
+++ b/inventory/group_vars/osbs-masters-stg
@@ -28,7 +28,6 @@ osbs_worker_service_accounts:
 
 
 osbs_conf_sources_command: fedpkg sources
-osbs_conf_vendor: Fedora Project
 
 osbs_orchestrator_cpu_limitrange: "95m"
 
@@ -99,7 +98,7 @@ _osbs_reactor_config_map:
         api_url: "https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1/"
 
     image_labels:
-      vendor: "{{ osbs_conf_vendor }}"
+      vendor: "Fedora Project"
       authoritative-source-url: "{{ source_registry }}"
       distribution-scope: public
 
diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 5118fee205..5e4d0882ce 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -98,7 +98,6 @@
           sources_command: 'fedpkg sources',
           build_type: 'prod',
           authoritative_registry: 'registry.stg.fedoraproject.org',
-          vendor: 'Fedora Project',
           verify_ssl: true,
           use_auth: true,
           builder_use_auth: true,
@@ -141,7 +140,6 @@
           sources_command: 'fedpkg sources',
           build_type: 'prod',
           authoritative_registry: 'registry.fedoraproject.org',
-          vendor: 'Fedora Project',
           verify_ssl: true,
           use_auth: true,
           builder_use_auth: true,
diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 28d19b246e..78cd91ee21 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -310,7 +310,6 @@
       osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}"
       osbs_authoritative_registry: "{{ source_registry }}"
       osbs_sources_command: "{{ osbs_conf_sources_command }}"
-      osbs_vendor: "{{ osbs_conf_vendor }}"
 
 - name: setup ODCS secret in worker namespace
   hosts: osbs-masters-stg[0]:osbs-masters[0]:osbs-aarch64-masters-stg[0]
@@ -338,7 +337,6 @@
     osbs_nodeselector: "{{ osbs_orchestrator_default_nodeselector|default('') }}"
     osbs_authoritative_registry: "{{ source_registry }}"
     osbs_sources_command: "{{ osbs_conf_sources_command }}"
-    osbs_vendor: "{{ osbs_conf_vendor }}"
     osbs_readwrite_users: "{{ osbs_conf_readwrite_users }}"
     osbs_service_accounts: "{{ osbs_conf_service_accounts }}"
     koji_use_kerberos: true
diff --git a/roles/osbs-namespace/defaults/main.yml b/roles/osbs-namespace/defaults/main.yml
index 961119fdd1..91e5804978 100644
--- a/roles/osbs-namespace/defaults/main.yml
+++ b/roles/osbs-namespace/defaults/main.yml
@@ -38,7 +38,7 @@ osbs_registry_uri: ''
 osbs_source_registry_uri: ''
 osbs_build_json_dir: /usr/share/osbs
 osbs_sources_command: fedpkg sources
-osbs_vendor: Fedora Project
+osbs_vendor: ""
 osbs_nodeselector: ''
 osbs_buildroot_repository: ''
 osbs_buildroot_imagestream: ''
diff --git a/roles/osbs-namespace/templates/client-config-secret.conf.j2 b/roles/osbs-namespace/templates/client-config-secret.conf.j2
index 92cc61df83..0144663b5d 100644
--- a/roles/osbs-namespace/templates/client-config-secret.conf.j2
+++ b/roles/osbs-namespace/templates/client-config-secret.conf.j2
@@ -47,13 +47,14 @@ registry_uri = {{ osbs_registry_uri }}
 source_registry_uri = {{ osbs_source_registry_uri }}
 {% endif %}
 sources_command = {{ osbs_sources_command }}
+{% if osbs_vendor %}
 vendor = {{ osbs_vendor }}
+{% endif %}}
 {% endfor %}
 {% endfor %}
 
 [platform:x86_64]
 architecture = amd64
-enable_v1 = true
 
 [platform:aarch64]
 architecture = arm64