From 81002d39bdbea0aef973da250e1523c24b10381f Mon Sep 17 00:00:00 2001 From: rblundon Date: Fri, 21 Mar 2025 22:52:17 -0500 Subject: [PATCH] update openshift agent installer for hub cluster --- 10-sno-hub-cluster/01-dhcp/README.md | 1 + .../01-matchbox/agent-config.yaml | 158 ------------------ 10-sno-hub-cluster/02-matchbox/README.md | 20 +++ .../02-matchbox/agent-config.yaml | 33 ++++ .../{01-matchbox => 02-matchbox}/groups.tf | 0 .../install-config.yaml | 12 +- .../{01-matchbox => 02-matchbox}/profiles.tf | 0 .../{01-matchbox => 02-matchbox}/provider.tf | 0 .../terraform.tfvars | 0 .../{01-matchbox => 02-matchbox}/variables.tf | 0 10 files changed, 60 insertions(+), 164 deletions(-) create mode 100644 10-sno-hub-cluster/01-dhcp/README.md delete mode 100644 10-sno-hub-cluster/01-matchbox/agent-config.yaml create mode 100644 10-sno-hub-cluster/02-matchbox/README.md create mode 100644 10-sno-hub-cluster/02-matchbox/agent-config.yaml rename 10-sno-hub-cluster/{01-matchbox => 02-matchbox}/groups.tf (100%) rename 10-sno-hub-cluster/{01-matchbox => 02-matchbox}/install-config.yaml (96%) rename 10-sno-hub-cluster/{01-matchbox => 02-matchbox}/profiles.tf (100%) rename 10-sno-hub-cluster/{01-matchbox => 02-matchbox}/provider.tf (100%) rename 10-sno-hub-cluster/{01-matchbox => 02-matchbox}/terraform.tfvars (100%) rename 10-sno-hub-cluster/{01-matchbox => 02-matchbox}/variables.tf (100%) diff --git a/10-sno-hub-cluster/01-dhcp/README.md b/10-sno-hub-cluster/01-dhcp/README.md new file mode 100644 index 0000000..4fad815 --- /dev/null +++ b/10-sno-hub-cluster/01-dhcp/README.md @@ -0,0 +1 @@ +# Add/modify entry in DNSmasq diff --git a/10-sno-hub-cluster/01-matchbox/agent-config.yaml b/10-sno-hub-cluster/01-matchbox/agent-config.yaml deleted file mode 100644 index 319b9e0..0000000 --- a/10-sno-hub-cluster/01-matchbox/agent-config.yaml +++ /dev/null @@ -1,158 +0,0 @@ -apiVersion: v1alpha1 -kind: AgentConfig -metadata: - name: ocp -rendezvousIP: 10.1.71.131 -bootArtifactsBaseURL: https://matchbox.int.mk-labs.cloud:8080/assets/sno2/ -hosts: - - hostname: ocp-master01 - role: master - interfaces: - - name: ens18 - macAddress: BC:24:11:47:2E:9C - networkConfig: - interfaces: - - name: ens18 - type: ethernet - state: up - mac-address: BC:24:11:47:2E:9C - ipv4: - enabled: true - dhcp: true - dns-resolver: - config: - server: - - 10.1.71.2 - routes: - config: - - destination: 0.0.0.0/0 - next-hop-address: 10.1.71.1 - next-hop-interface: ens18 - table-id: 254 - - hostname: ocp-master02 - role: master - interfaces: - - name: ens18 - macAddress: BC:24:11:6D:EB:15 - networkConfig: - interfaces: - - name: ens18 - type: ethernet - state: up - mac-address: BC:24:11:6D:EB:15 - ipv4: - enabled: true - dhcp: true - dns-resolver: - config: - server: - - 10.1.71.2 - routes: - config: - - destination: 0.0.0.0/0 - next-hop-address: 10.1.71.1 - next-hop-interface: ens18 - table-id: 254 - - hostname: ocp-master03 - role: master - interfaces: - - name: ens18 - macAddress: BC:24:11:73:03:0F - networkConfig: - interfaces: - - name: ens18 - type: ethernet - state: up - mac-address: BC:24:11:73:03:0F - ipv4: - enabled: true - dhcp: true - dns-resolver: - config: - server: - - 10.1.71.2 - routes: - config: - - destination: 0.0.0.0/0 - next-hop-address: 10.1.71.1 - next-hop-interface: ens18 - table-id: 254 - - hostname: ocp-worker01 - role: worker - interfaces: - - name: enp2s0f0 - macAddress: 58:47:CA:76:15:FF - networkConfig: - interfaces: - - name: enp2s0f0 - type: ethernet - state: up - identifier: mac-address - mac-address: 58:47:CA:76:15:FF - ipv4: - enabled: true - dhcp: true - - name: enp87s0 - state: down - dns-resolver: - config: - server: - - 10.1.71.2 - routes: - config: - - destination: 0.0.0.0/0 - next-hop-address: 10.1.71.1 - next-hop-interface: enp2s0f0 - table-id: 254 - - hostname: ocp-worker02 - role: worker - interfaces: - - name: enp2s0f0 - macAddress: 58:47:CA:76:13:47 - networkConfig: - interfaces: - - name: enp2s0f0 - type: ethernet - state: up - identifier: mac-address - mac-address: 58:47:CA:76:13:47 - ipv4: - enabled: true - dhcp: true - - name: enp87s0 - state: down - dns-resolver: - config: - server: - - 10.1.71.2 - routes: - config: - - destination: 0.0.0.0/0 - next-hop-address: 10.1.71.1 - next-hop-interface: enp2s0f0 - table-id: 254 - - hostname: ocp-worker03 - role: worker - interfaces: - - name: enp1s0f0 - macAddress: 98:B7:85:1E:C6:F1 - networkConfig: - interfaces: - - name: enp1s0f0 - type: ethernet - state: up - identifier: mac-address - mac-address: 98:B7:85:1E:C6:F1 - ipv4: - enabled: true - dhcp: true - dns-resolver: - config: - server: - - 10.1.71.2 - routes: - config: - - destination: 0.0.0.0/0 - next-hop-address: 10.1.71.1 - next-hop-interface: enp1s0f0 - table-id: 254 \ No newline at end of file diff --git a/10-sno-hub-cluster/02-matchbox/README.md b/10-sno-hub-cluster/02-matchbox/README.md new file mode 100644 index 0000000..7598d24 --- /dev/null +++ b/10-sno-hub-cluster/02-matchbox/README.md @@ -0,0 +1,20 @@ +# Configure the OpenShift Agent Installer and Matchbox + +## Create OpenShift Installation Files + + + +### Downloading the Agent-based Installer + +### Create/Modify config files + +- agent-config.yaml +- install-config.yaml + +### Run image creation + +```bash +openshift-install agent create pxe-files +``` + +Recap of install in .openshift_install.log diff --git a/10-sno-hub-cluster/02-matchbox/agent-config.yaml b/10-sno-hub-cluster/02-matchbox/agent-config.yaml new file mode 100644 index 0000000..b57c869 --- /dev/null +++ b/10-sno-hub-cluster/02-matchbox/agent-config.yaml @@ -0,0 +1,33 @@ +apiVersion: v1alpha1 +kind: AgentConfig +metadata: + name: hub +rendezvousIP: 10.1.71.11 +bootArtifactsBaseURL: https://matchbox.int.mk-labs.cloud:8080/assets/sno-hub/ +hosts: + - hostname: hub + role: master + interfaces: + - name: enp1s0f0 + macAddress: 98:B7:85:1E:C6:F1 + networkConfig: + interfaces: + - name: enp1s0f0 + type: ethernet + state: up + identifier: mac-address + mac-address: 98:B7:85:1E:C6:F1 + ipv4: + enabled: true + dhcp: true + dns-resolver: + config: + server: + - 10.1.71.254 + - 10.1.71.253 + routes: + config: + - destination: 0.0.0.0/0 + next-hop-address: 10.1.71.1 + next-hop-interface: enp1s0f0 + table-id: 254 diff --git a/10-sno-hub-cluster/01-matchbox/groups.tf b/10-sno-hub-cluster/02-matchbox/groups.tf similarity index 100% rename from 10-sno-hub-cluster/01-matchbox/groups.tf rename to 10-sno-hub-cluster/02-matchbox/groups.tf diff --git a/10-sno-hub-cluster/01-matchbox/install-config.yaml b/10-sno-hub-cluster/02-matchbox/install-config.yaml similarity index 96% rename from 10-sno-hub-cluster/01-matchbox/install-config.yaml rename to 10-sno-hub-cluster/02-matchbox/install-config.yaml index 1720ee5..cc3de2b 100644 --- a/10-sno-hub-cluster/01-matchbox/install-config.yaml +++ b/10-sno-hub-cluster/02-matchbox/install-config.yaml @@ -2,12 +2,12 @@ apiVersion: v1 baseDomain: int.mk-labs.cloud compute: - name: worker - replicas: 3 + replicas: 0 controlPlane: name: master - replicas: 3 + replicas: 1 metadata: - name: ocp-external + name: hub networking: clusterNetwork: - cidr: 10.128.0.0/14 #<== Internal node network. Not available externally. @@ -20,9 +20,9 @@ networking: platform: baremetal: apiVIPs: - - 10.1.71.139 + - 10.1.71.10 ingressVIPs: - - 10.1.71.130 + - 10.1.71.10 fips: false pullSecret: '{"auths":{"cloud.openshift.com":{"auth":"b3BlbnNoaWZ0LXJlbGVhc2UtZGV2K29jbV9hY2Nlc3NfY2ZlYjYxMjE5ZmFiNDA1OWIwZWZmZDJlZTUxZTNlOTc6UjhaUEs2UEQyTjlBNURERUxHUjE0UDdLQ1pWR1ZPME1KUDYzUTUzQ0hBMTlIVjE4STJETzBHMkdGNzg2QjQxOA==","email":"rblundon@redhat.com"},"quay.io":{"auth":"b3BlbnNoaWZ0LXJlbGVhc2UtZGV2K29jbV9hY2Nlc3NfY2ZlYjYxMjE5ZmFiNDA1OWIwZWZmZDJlZTUxZTNlOTc6UjhaUEs2UEQyTjlBNURERUxHUjE0UDdLQ1pWR1ZPME1KUDYzUTUzQ0hBMTlIVjE4STJETzBHMkdGNzg2QjQxOA==","email":"rblundon@redhat.com"},"registry.connect.redhat.com":{"auth":"fHVoYy1wb29sLTk0ZGM3NWFiLTEyYzAtNGRhMC1hMjI5LTBmOTZiY2Y2NGZhMDpleUpoYkdjaU9pSlNVelV4TWlKOS5leUp6ZFdJaU9pSmhabVppWWpRMFpqWXlPVEkwTVRKaFlqWTBaVFl3T1RSaFpqRmpabUk0WlNKOS5tS3RLNnYxa1ZEZjZOcXJweTBXTjRubEQ1bDFhTG9sbWtvV3YzYzcwdTJJb29iODBsZGEtanJHYV85LWVVUU1IM1dsU3BvdEQzQzFBdi1wUE5pT0tKM2paSGJGOEoxTlNtSmdsb0hSR214NDZXb2FGYlh5c2JuUVhwamNBU0l4MnpZQ1hFSWlaNkZrRzFwUUMzWHlISTdsMVh6dEZ1TG5yWFBGUUhUdHFJcm5KNDA5R2c2Uk5jNXhnOEpMWEY4UmFWM2x1SGZqdWY2RHJRaGdzc3Vla1BOcDc0Q0g1Y0k4T3pYVWVLMy1xelZkQ3FaSDhZYXp5dHVJRDFmQkxyUDV4Nnh5a3U3NFd6dEJXaE9rMFRBdnVldkNHSVlLOV91MGlFSVl0bll5TTJndnpWSTl4YXBUckkwMW9DcF9NXzh2YU1YVzJjb2ZUNEE5b2VrZDM0ZmdkUGs4MFU0UzBBN0RabWpiMFZCT211Y0xuX1F6U2FQMkZjMmtGNDExenBfb2I5ZHl1MEZhSXN5bF9YTG5kZDF3S21JU2N6N04tZDBpM244QkpvYnh6YUJwZzJxUEdhV2VvTXJNWmYwRGdzVEo4VmhBSWlBNTVwUDYwSGVpRzdzMUhUQ1Rudl9kTlpaMWY0TzMwUTBNVnRTQWl6Q3Q0azdnbHd5VzZVamU4czd2WVZPekFvUEFvTEZKQVZVcUcwWUNUYXJodnBsZ204MWlzWHhwWk5nMEQwUkZISmRIYXFmRXQtVE5wVHplZzlBOEZ6QkVQaG5ZTU1ZMEhzUVpONHFNbE1kTHBHOHJrZU04azRoWGIyQ08wcFZvMUluY1d2aFQ5cDgxV1M0QlNfMHR6bG1EckdTbXJYN3JNTnN1V2RZbmlpNm16WFJuRUlIV25FelNUc2hhLUtRcw==","email":"rblundon@redhat.com"},"registry.redhat.io":{"auth":"fHVoYy1wb29sLTk0ZGM3NWFiLTEyYzAtNGRhMC1hMjI5LTBmOTZiY2Y2NGZhMDpleUpoYkdjaU9pSlNVelV4TWlKOS5leUp6ZFdJaU9pSmhabVppWWpRMFpqWXlPVEkwTVRKaFlqWTBaVFl3T1RSaFpqRmpabUk0WlNKOS5tS3RLNnYxa1ZEZjZOcXJweTBXTjRubEQ1bDFhTG9sbWtvV3YzYzcwdTJJb29iODBsZGEtanJHYV85LWVVUU1IM1dsU3BvdEQzQzFBdi1wUE5pT0tKM2paSGJGOEoxTlNtSmdsb0hSR214NDZXb2FGYlh5c2JuUVhwamNBU0l4MnpZQ1hFSWlaNkZrRzFwUUMzWHlISTdsMVh6dEZ1TG5yWFBGUUhUdHFJcm5KNDA5R2c2Uk5jNXhnOEpMWEY4UmFWM2x1SGZqdWY2RHJRaGdzc3Vla1BOcDc0Q0g1Y0k4T3pYVWVLMy1xelZkQ3FaSDhZYXp5dHVJRDFmQkxyUDV4Nnh5a3U3NFd6dEJXaE9rMFRBdnVldkNHSVlLOV91MGlFSVl0bll5TTJndnpWSTl4YXBUckkwMW9DcF9NXzh2YU1YVzJjb2ZUNEE5b2VrZDM0ZmdkUGs4MFU0UzBBN0RabWpiMFZCT211Y0xuX1F6U2FQMkZjMmtGNDExenBfb2I5ZHl1MEZhSXN5bF9YTG5kZDF3S21JU2N6N04tZDBpM244QkpvYnh6YUJwZzJxUEdhV2VvTXJNWmYwRGdzVEo4VmhBSWlBNTVwUDYwSGVpRzdzMUhUQ1Rudl9kTlpaMWY0TzMwUTBNVnRTQWl6Q3Q0azdnbHd5VzZVamU4czd2WVZPekFvUEFvTEZKQVZVcUcwWUNUYXJodnBsZ204MWlzWHhwWk5nMEQwUkZISmRIYXFmRXQtVE5wVHplZzlBOEZ6QkVQaG5ZTU1ZMEhzUVpONHFNbE1kTHBHOHJrZU04azRoWGIyQ08wcFZvMUluY1d2aFQ5cDgxV1M0QlNfMHR6bG1EckdTbXJYN3JNTnN1V2RZbmlpNm16WFJuRUlIV25FelNUc2hhLUtRcw==","email":"rblundon@redhat.com"}}}' -sshKey: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICB/UfNTK2JX8Lq0H75yHrWgr32vhLFBcE7r+cEC6hvd rblundon@rblundon-mac' \ No newline at end of file +sshKey: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICB/UfNTK2JX8Lq0H75yHrWgr32vhLFBcE7r+cEC6hvd rblundon@rblundon-mac' diff --git a/10-sno-hub-cluster/01-matchbox/profiles.tf b/10-sno-hub-cluster/02-matchbox/profiles.tf similarity index 100% rename from 10-sno-hub-cluster/01-matchbox/profiles.tf rename to 10-sno-hub-cluster/02-matchbox/profiles.tf diff --git a/10-sno-hub-cluster/01-matchbox/provider.tf b/10-sno-hub-cluster/02-matchbox/provider.tf similarity index 100% rename from 10-sno-hub-cluster/01-matchbox/provider.tf rename to 10-sno-hub-cluster/02-matchbox/provider.tf diff --git a/10-sno-hub-cluster/01-matchbox/terraform.tfvars b/10-sno-hub-cluster/02-matchbox/terraform.tfvars similarity index 100% rename from 10-sno-hub-cluster/01-matchbox/terraform.tfvars rename to 10-sno-hub-cluster/02-matchbox/terraform.tfvars diff --git a/10-sno-hub-cluster/01-matchbox/variables.tf b/10-sno-hub-cluster/02-matchbox/variables.tf similarity index 100% rename from 10-sno-hub-cluster/01-matchbox/variables.tf rename to 10-sno-hub-cluster/02-matchbox/variables.tf