Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenShift Client issue has been resolved along with DNS issue #367

Merged
merged 3 commits into from
Dec 18, 2024
Merged

OpenShift Client issue has been resolved along with DNS issue #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3f2977
OpenShift Client issue has been resolved along with DNS issue for Mir…
Dec 13, 2024
38a53e8
Merge branch 'main' into aop_bug_364
isumitsolanki Dec 18, 2024
9a944e2
Removed commented line from offline roles to look clean
Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions roles/disconnected_mirror_images/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
- name: mirror artifacts in disconnected mode
tags: mirror_artifacts
block:
- name: Setting Up nameserver on mirror host to resolve DNS
ansible.builtin.template:
src: resolv.conf.j2
dest: /etc/resolv.conf
owner: root
group: root
mode: "644"
- name: Get user home directory
tags: mirror_artifacts
shell: >
Expand Down
3 changes: 3 additions & 0 deletions roles/disconnected_mirror_images/templates/resolv.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
search {{ env.cluster.networking.base_domain }}
nameserver {{ env.bastion.networking.nameserver1 }}
{{ ('nameserver ' + env.bastion.networking.nameserver2) if env.bastion.networking.nameserver2 is defined else '' }}
2 changes: 1 addition & 1 deletion roles/dns/templates/dns.db.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ apps.{{ env.cluster.networking.metadata_name }} IN CNAME {{ env.bastion.netw

{% if disconnected.enabled %}
;entry for mirror host.
{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}. IN A {{ env.file_server.ip }}
{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}. IN A {{ disconnected.mirroring.host.ip }}
{% endif %}

;EOF
2 changes: 1 addition & 1 deletion roles/offline_artifacts/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
remote_src: yes
loop:
- "{{ env.file_server.protocol }}://{{ env.file_server.user + ':' + env.file_server.pass + '@' if env.file_server.protocol == 'ftp' else '' }}{{ env.file_server.ip }}{{ ':' + env.file_server.port if env.file_server.port | default('') | length > 0 else '' }}/{{ disconnected.mirroring.file_server.clients_dir }}/{{ disconnected.mirroring.file_server.oc_mirror_tgz }}"
- "{{ env.file_server.protocol }}://{{ env.file_server.user + ':' + env.file_server.pass + '@' if env.file_server.protocol == 'ftp' else '' }}{{ env.file_server.ip }}{{ ':' + env.file_server.port if env.file_server.port | default('') | length > 0 else '' }}/{{ disconnected.mirroring.file_server.clients_dir }}/{{ disconnected.mirroring.client_download.ocp_client_tgz }}"
- "{{ disconnected.mirroring.client_download.ocp_download_url }}{{ disconnected.mirroring.client_download.ocp_client_tgz }}"

- name: Copy kubectl, oc, and oc-mirror binaries to /usr/local/sbin
become: true
Expand Down