Skip to content

Commit

Permalink
Update default MicroShift version to 4.14; update OLM and Operator SDK
Browse files Browse the repository at this point in the history
The 4.13 is outdated and we should switch to newer release.
Also by changing the MicroShift version, the OLM installation
raises an error, so it has been also updated to newer version.
  • Loading branch information
danpawlik committed Jun 7, 2024
1 parent 172b6b2 commit fcc9da2
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 28 deletions.
58 changes: 33 additions & 25 deletions defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,29 +39,39 @@ firewalld_rules_permament: true
use_copr_microshift: false

# The Microshift version that is available in the repository.
microshift_version: 4.13
microshift_version: 4.14

# Default settings from /etc/microshift/config.yaml.default
# https://github.com/openshift/microshift/blob/release-4.13/packaging/microshift/config.yaml
# https://github.com/openshift/microshift/blob/release-4.14/packaging/microshift/config.yaml
microshift_config: {}
# dns:
# baseDomain: microshift.example.com
# network:
# clusterNetwork:
# - cidr: 10.42.0.0/16
# serviceNetwork:
# - 10.43.0.0/16
# serviceNodePortRange: 30000-32767
# node:
# hostnameOverride: ''
# nodeIP: ''
# apiServer:
# subjectAltNames: []
# debugging:
# logLevel: 'Normal'
# apiServer:
# advertiseAddress: ""
# subjectAltNames:
# - ""
# debugging:
# logLevel: Normal
# dns:
# baseDomain: example.com
# etcd:
# memoryLimitMB: 0
# manifests:
# kustomizePaths:
# - /usr/lib/microshift/manifests
# - /usr/lib/microshift/manifests.d/*
# - /etc/microshift/manifests
# - /etc/microshift/manifests.d/*
# network:
# clusterNetwork:
# - 10.42.0.0/16
# serviceNetwork:
# - 10.43.0.0/16
# serviceNodePortRange: 30000-32767
# node:
# hostnameOverride: ""
# nodeIP: ""

# Default settings from /etc/microshift/lvmd.yaml.default
# https://github.com/openshift/microshift/blob/release-4.13/packaging/microshift/lvmd.yaml
# https://github.com/openshift/microshift/blob/release-4.14/packaging/microshift/lvmd.yaml
microshift_lmvd: {}
# socket-name: /run/lvmd/lvmd.socket
# device-classes:
Expand All @@ -75,12 +85,8 @@ microshift_lmvd: {}
# - ""

# Default settings from /etc/microshift/ovn.yaml.default
# https://github.com/openshift/microshift/blob/release-4.13/packaging/microshift/ovn.yaml
# https://github.com/openshift/microshift/blob/release-4.14/packaging/microshift/ovn.yaml
microshift_ovn: {}
# ovsInit:
# disableOVSInit: false
# gatewayInterface: ""
# externalGatewayInterface: ""
# mtu: 1500

#######################################
Expand All @@ -89,15 +95,17 @@ microshift_ovn: {}

# Install the OLM - https://olm.operatorframework.io/
setup_olm: false
olm_version: "v0.24.0"
# https://github.com/operator-framework/operator-lifecycle-manager/releases
olm_version: "v0.28.0"

# Location where the additional projects should be keeped.
# For example, if `setup_olm` is enabled, it will use Git to clone project
# to that directory.
repo_dir: "~{{ ansible_user }}/repos"

# Version of the Operator SDK
operator_sdk_version: "v1.28.0"
# https://github.com/operator-framework/operator-sdk/releases
operator_sdk_version: "v1.34.2"

#######################################
### Openshift Storage ###
Expand Down
6 changes: 3 additions & 3 deletions templates/microshift.repo.j2
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[microshift-rpms]
name=Puddle of Microshift RPMs
{% if microshift_version == 4.12 %}
baseurl=https://mirror.openshift.com/pub/openshift-v4/$basearch/microshift/ocp-dev-preview/latest-{{ microshift_version }}/el8/os/
{% else %}
{% if microshift_version == 4.12 or microshift_version == 4.13 %}
baseurl=https://mirror.openshift.com/pub/openshift-v4/$basearch/microshift/ocp-dev-preview/latest-{{ microshift_version }}/el{{ ansible_distribution_major_version }}/os/
{% else %}
baseurl=https://mirror.openshift.com/pub/openshift-v4/$basearch/microshift/ocp/latest-{{ microshift_version }}/el{{ ansible_distribution_major_version }}/os/
{% endif %}
enabled=0
gpgcheck=0
Expand Down

0 comments on commit fcc9da2

Please sign in to comment.