Skip to content

Commit a258dc7

Browse files
soukronsoukron
committed
Moved templates into a more flexible way to generation. next step: find the right one for each version
1 parent 8330c97 commit a258dc7

File tree

11 files changed

+226
-10
lines changed

11 files changed

+226
-10
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
openshift-install-wrapper
33
src/scripts/functions
44
src/scripts/names
5+
src/config/30_templates.sh

‎Makefile

+6-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ version: ## Output the current version.
2626
.ONESHELL:
2727
merge-scripts: create-main-wrapper ## Merge the scripts in the main script
2828
@echo Merging scripts into openshift-install-wrapper
29-
cd src/scripts && ./.merge-scripts
29+
cd src/scripts && ./.merge-scripts.sh
30+
31+
merge-templates: ## Merge the install-config templates in the templates file
32+
@echo Merging install-config templates into variables file
33+
cd src/config/templates && ./.merge-templates.sh
3034

3135
create-main-wrapper: ## Creates the wrapper with all the src/ content
3236
@echo "Combining source files into openshift-install-wrapper"
@@ -52,4 +56,4 @@ copy-binary-wrappers: ## Copy wrappers to binaries directory
5256
@chmod 755 $(TARGETDIR)/bin/openshift-install-wrapper
5357
@echo "Wrappers installed in $(TARGETDIR)/bin. Please remember to add this location to your PATH to use it."
5458

55-
install: create-dirs create-main-wrapper create-binary-wrappers merge-scripts copy-binary-wrappers ## Installs the script
59+
install: create-dirs merge-templates create-main-wrapper create-binary-wrappers merge-scripts copy-binary-wrappers ## Installs the script

‎src/config/30_templates.sh

-8
This file was deleted.

‎src/config/templates/.merge-templates.sh

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
3+
output_file="../30_templates.sh"
4+
echo "# install-config templates" > "$output_file"
5+
6+
for file in $(find . -type f -name "*.yaml"); do
7+
platform=$(basename $(dirname "$file"))
8+
filename=$(basename "$file" .yaml)
9+
key="${platform}-${filename}"
10+
11+
base64_content=$(base64 -w 0 "$file")
12+
echo "INSTALLTEMPLATES[$key]=\"$base64_content\"" >> "$output_file"
13+
done
14+
echo "" >> "$output_file"

‎src/config/templates/aws/default.yaml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
apiVersion: v1
2+
baseDomain: DOMAIN
3+
compute:
4+
- hyperthreading: Enabled
5+
name: worker
6+
platform:
7+
aws:
8+
type: m5.2xlarge
9+
replicas: WORKER-REPLICAS
10+
controlPlane:
11+
hyperthreading: Enabled
12+
name: master
13+
platform: {}
14+
replicas: MASTER-REPLICAS
15+
metadata:
16+
creationTimestamp: null
17+
name: NAME
18+
networking:
19+
clusterNetwork:
20+
- cidr: 10.128.0.0/14
21+
hostPrefix: 23
22+
machineNetwork:
23+
- cidr: MACHINE-NETWORK
24+
networkType: NETWORK-TYPE
25+
serviceNetwork:
26+
- 172.30.0.0/16
27+
platform:
28+
aws:
29+
region: REGION
30+
userTags: TAGS
31+
publish: External

‎src/config/templates/azure/default.yaml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
apiVersion: v1
2+
baseDomain: DOMAIN
3+
compute:
4+
- architecture: amd64
5+
hyperthreading: Enabled
6+
name: worker
7+
platform: {}
8+
replicas: WORKER-REPLICAS
9+
controlPlane:
10+
architecture: amd64
11+
hyperthreading: Enabled
12+
name: master
13+
platform: {}
14+
replicas: MASTER-REPLICAS
15+
metadata:
16+
creationTimestamp: null
17+
name: NAME
18+
networking:
19+
clusterNetwork:
20+
- cidr: 10.128.0.0/14
21+
hostPrefix: 23
22+
machineNetwork:
23+
- cidr: MACHINE-NETWORK
24+
networkType: NETWORK-TYPE
25+
serviceNetwork:
26+
- 172.30.0.0/16
27+
platform:
28+
azure:
29+
baseDomainResourceGroupName: RESOURCEGROUP
30+
region: REGION
31+
publish: External

‎src/config/templates/gcp/default.yaml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
apiVersion: v1
2+
baseDomain: DOMAIN
3+
compute:
4+
- architecture: amd64
5+
hyperthreading: Enabled
6+
name: worker
7+
platform: {}
8+
replicas: WORKER-REPLICAS
9+
controlPlane:
10+
architecture: amd64
11+
hyperthreading: Enabled
12+
name: master
13+
platform: {}
14+
replicas: MASTER-REPLICAS
15+
metadata:
16+
name: NAME
17+
networking:
18+
clusterNetwork:
19+
- cidr: 10.128.0.0/14
20+
hostPrefix: 23
21+
machineNetwork:
22+
- cidr: MACHINE-NETWORK
23+
networkType: NETWORK-TYPE
24+
serviceNetwork:
25+
- 172.30.0.0/16
26+
platform:
27+
gcp:
28+
projectID: GCP-PROJECT-ID
29+
region: REGION

‎src/config/templates/openstack/default.yaml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
apiVersion: v1
2+
baseDomain: DOMAIN
3+
compute:
4+
- architecture: amd64
5+
hyperthreading: Enabled
6+
name: worker
7+
platform: {}
8+
replicas: WORKER-REPLICAS
9+
controlPlane:
10+
architecture: amd64
11+
hyperthreading: Enabled
12+
name: master
13+
platform: {}
14+
replicas: MASTER-REPLICAS
15+
metadata:
16+
name: NAME
17+
networking:
18+
clusterNetwork:
19+
- cidr: 10.128.0.0/14
20+
hostPrefix: 23
21+
machineNetwork:
22+
- cidr: MACHINE-NETWORK
23+
networkType: NETWORK-TYPE
24+
serviceNetwork:
25+
- 172.30.0.0/16
26+
platform:
27+
openstack:
28+
cloud: OSP-CLOUD
29+
computeFlavor: OSP-OS-FLAVOR
30+
externalNetwork: OSP-EXT-NETWORK
31+
clusterOSImage: OSP-OS-IMAGE
32+
lbFloatingIP: OSP-API-FIP
33+
ingressFloatingIP: OSP-INGRESS-FIP

‎src/config/templates/ovirt/default.yaml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
apiVersion: v1
2+
baseDomain: DOMAIN
3+
controlPlane:
4+
name: master
5+
platform:
6+
ovirt:
7+
cpu:
8+
cores: 4
9+
sockets: 2
10+
memoryMB: 16384
11+
osDisk:
12+
sizeGB: 50
13+
vmType: server
14+
replicas: MASTER-REPLICAS
15+
compute:
16+
- name: worker
17+
platform:
18+
ovirt:
19+
cpu:
20+
cores: 4
21+
sockets: 4
22+
memoryMB: 16384
23+
osDisk:
24+
sizeGB: 50
25+
vmType: server
26+
replicas: WORKER-REPLICAS
27+
metadata:
28+
name: NAME
29+
platform:
30+
ovirt:
31+
api_vip: OVIRT-VIP-API
32+
ingress_vip: OVIRT-VIP-INGRESS
33+
dns_vip: OVIRT-VIP-DNS
34+
ovirt_cluster_id: OVIRT-CLUSTER
35+
ovirt_storage_domain_id: OVIRT-STORAGEDOMAN
36+
ovirt_network_name: OVIRT-NETWORK
37+

‎src/config/templates/vsphere/default.yaml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
apiVersion: v1
2+
baseDomain: DOMAIN
3+
compute:
4+
- architecture: amd64
5+
hyperthreading: Enabled
6+
name: worker
7+
platform:
8+
vsphere:
9+
osDisk:
10+
diskSizeGB: VSPHERE-DISK-SIZE-GB
11+
replicas: WORKER-REPLICAS
12+
controlPlane:
13+
architecture: amd64
14+
hyperthreading: Enabled
15+
name: master
16+
platform:
17+
vsphere:
18+
osDisk:
19+
diskSizeGB: VSPHERE-DISK-SIZE-GB
20+
replicas: MASTER-REPLICAS
21+
metadata:
22+
creationTimestamp: null
23+
name: NAME
24+
networking:
25+
clusterNetwork:
26+
- cidr: 10.128.0.0/14
27+
hostPrefix: 23
28+
machineNetwork:
29+
- cidr: MACHINE-NETWORK
30+
networkType: NETWORK-TYPE
31+
serviceNetwork:
32+
- 172.30.0.0/16
33+
platform:
34+
vsphere:
35+
apiVIP: VSPHERE-VIP-API
36+
cluster: VSPHERE-CLUSTER
37+
datacenter: VSPHERE-DATACENTER
38+
defaultDatastore: VSPHERE-DATASTORE
39+
ingressVIP: VSPHERE-VIP-INGRESS
40+
network: VSPHERE-NETWORK
41+
password: VSPHERE-PASSWORD
42+
username: VSPHERE-USER
43+
vCenter: VSPHERE-VCENTER
44+
publish: External

‎src/scripts/.merge-scripts ‎src/scripts/.merge-scripts.sh

File renamed without changes.

0 commit comments

Comments
 (0)