Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ arbiter:
{% if feature_set %}
featureSet: {{ feature_set }}
{% endif %}
{% if feature_gates %}
featureGates:
{% for gate in feature_gates.split(',') %}
- {{ gate }}
{% endfor %}
{% endif %}
controlPlane:
architecture: {{ goCPUArchitecture }}
hyperthreading: Enabled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ arbiter:
{% if feature_set %}
featureSet: {{ feature_set }}
{% endif %}
{% if feature_gates %}
featureGates:
{% for gate in feature_gates.split(',') %}
- {{ gate }}
{% endfor %}
{% endif %}
controlPlane:
architecture: {{ goCPUArchitecture }}
hyperthreading: Enabled
Expand Down
6 changes: 6 additions & 0 deletions agent/roles/manifests/templates/install-config_yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ arbiter:
{% if feature_set %}
featureSet: {{ feature_set }}
{% endif %}
{% if feature_gates %}
featureGates:
{% for gate in feature_gates.split(',') %}
- {{ gate }}
{% endfor %}
{% endif %}
controlPlane:
architecture: {{ goCPUArchitecture }}
hyperthreading: Enabled
Expand Down
1 change: 1 addition & 0 deletions agent/roles/manifests/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ num_masters: "{{ lookup('env', 'NUM_MASTERS') }}"
num_workers: "{{ lookup('env', 'NUM_WORKERS') }}"
num_arbiters: "{{ lookup('env', 'NUM_ARBITERS') }}"
feature_set: "{{ lookup('env', 'FEATURE_SET') }}"
feature_gates: "{{ lookup('env', 'FEATURE_GATES') }}"
num_extra_workers: "{{ lookup('env', 'NUM_EXTRA_WORKERS', default='0') }}"
no_proxy: "{{ lookup('env', 'AGENT_NO_PROXY') }}"
platform_type: "{{ lookup('env', 'AGENT_PLATFORM_TYPE') }}"
Expand Down
18 changes: 18 additions & 0 deletions config_example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,24 @@ set -x
#
#ADDITIONAL_CAPABILITIES=baremetal,Console

# FEATURE_SET -
# Enable a feature set for the cluster. Feature sets are a collection of features that
# are enabled together.
# Default: Undefined (uses the default feature set)
#
# For more info see:
# https://docs.openshift.com/container-platform/latest/nodes/clusters/nodes-cluster-enabling-features.html
#
#export FEATURE_SET="TechPreviewNoUpgrade"

# FEATURE_GATES -
# Enable specific feature gates for the cluster. This should be provided as a
# comma-separated list of feature gate names as key=value pairs, where value is a boolean of true or false.
# Default: Undefined
#
# Example:
#export FEATURE_GATES="ExampleFeatureGateA=true,ExampleFeatureGateB=false"

# MASTER_HOSTNAME_FORMAT -
# Set a custom hostname format for masters. This is a format string that should
# include one %d field, which will be replaced with the number of the node.
Expand Down
14 changes: 14 additions & 0 deletions ocp_install_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,19 @@ EOF
fi
}

function featureGates() {
if [[ -n "$FEATURE_GATES" ]]; then
cat <<EOF
featureGates:
EOF
for gate in ${FEATURE_GATES//,/ }; do
cat <<EOF
- $gate
EOF
done
fi
}

function capabilities_stanza() {
if [[ -n "$BASELINE_CAPABILITY_SET" ]]; then
cat <<EOF
Expand Down Expand Up @@ -392,6 +405,7 @@ controlPlane:
$(node_map_to_install_config_fencing_credentials)
$(arbiter_stanza)
$(featureSet)
$(featureGates)
$(capabilities_stanza)
platform:
baremetal:
Expand Down