Merge pull request #62 from danpawlik/update-4.14

Update default MicroShift version to 4.14

defaults/main.yaml

@@ -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:
@@ -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
 
 #######################################
@@ -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        ###

templates/microshift.repo.j2

@@ -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