Skip to content

Commit

Permalink
Merge pull request #36 from mvazquezc/lab-4.15
Browse files Browse the repository at this point in the history
Update to 4.15 - Commit 1
  • Loading branch information
mvazquezc authored May 6, 2024
2 parents fb021ff + f7b8ea2 commit 2347815
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 20 deletions.
1 change: 1 addition & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- 'lab-4.13'
- 'lab-4.14'
- 'lab-4.15'
env:
SITE_DIR: "gh-pages"
jobs:
Expand Down
30 changes: 15 additions & 15 deletions documentation/modules/ROOT/pages/_attributes.adoc
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
:experimental:
:source-highlighter: highlightjs
:branch: lab-4.14
:branch: lab-4.15
:github-repo: https://github.com/RHsyseng/hypershift-baremetal-lab/blob/{branch}
:profile: hypershift-baremetal-lab
:rhel-version: v8.9
:openshift-release: v4.14
:tooling-version: 4.14
:mce-version: 2.4
:hosted-control-planes-version: 4.14
:management-cluster-version: 4.14.6
:openshift-release: v4.15
:tooling-version: 4.15
:mce-version: 2.5
:hosted-control-planes-version: 4.15
:management-cluster-version: 4.15.10
:management-cluster-kubeversion: v1.27.8+4fab27b
:hosted-cluster-version-1: 4.14.1
:hosted-cluster-version-1: 4.15.6
:hosted-cluster-kubeversion-1: v1.27.6+f67aeb3
:hosted-cluster-rhcos-machineos-1: 414.92.202310270216-0
:hosted-cluster-kernel-1: 5.14.0-284.36.1.el9_2.x86_64
:hosted-cluster-container-runtime-1: cri-o://1.27.1-11.1.rhaos4.14.git9b9c375.el9
:hosted-cluster-version-2: 4.14.2
:hosted-cluster-version-2: 4.15.8
:hosted-cluster-kubeversion-2: v1.27.6+f67aeb3
:hosted-cluster-rhcos-machineos-2: 414.92.202311061957-0
:hosted-cluster-kernel-2: 5.14.0-284.40.1.el9_2.x86_64
:hosted-cluster-container-runtime-2: cri-o://1.27.1-13.1.rhaos4.14.git956c5f7.el9
:hosted-cluster-version-3: 4.14.3
:hosted-cluster-version-3: 4.15.9
:hosted-cluster-kubeversion-3: v1.27.6+b49f9d1
:hosted-cluster-rhcos-machineos-3: 414.92.202311150705-0
:hosted-cluster-kernel-3: 5.14.0-284.41.1.el9_2.x86_64
Expand All @@ -31,9 +31,9 @@
:metallb-operator-docs-link: https://docs.openshift.com/container-platform/4.14/networking/metallb/about-metallb.html
:hypershift-upstream-docs-link: https://hypershift-docs.netlify.app
:hosted-control-planes-docs-link: https://docs.openshift.com/container-platform/4.14/architecture/control-plane.html#hosted-control-planes-overview_control-plane
:mce-channel: stable-2.4
:assisted-service-config-ocp-version: 4.14
:assisted-service-config-rhcos-live-iso-url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-x86_64-live.x86_64.iso
:assisted-service-config-rhcos-rootfs-url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-x86_64-live-rootfs.x86_64.img
:assisted-service-config-rhcos-machineos: 414.92.202310210434-0
:last-update-time: 2023-12-11
:mce-channel: stable-2.5
:assisted-service-config-ocp-version: 4.15
:assisted-service-config-rhcos-live-iso-url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.15/4.15.0/rhcos-4.15.0-x86_64-live.x86_64.iso
:assisted-service-config-rhcos-rootfs-url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.15/4.15.0/rhcos-4.15.0-x86_64-live-rootfs.x86_64.img
:assisted-service-config-rhcos-machineos: 415.92.202402201450-0
:last-update-time: 2024-05-06
4 changes: 2 additions & 2 deletions lab-materials/hosted-cluster/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
spec:
release:
image: quay.io/openshift-release-dev/ocp-release:4.14.1-multi
image: quay.io/openshift-release-dev/ocp-release:4.15.6-multi
pullSecret:
name: pullsecret-cluster-hosted
sshKey:
Expand Down Expand Up @@ -76,7 +76,7 @@ spec:
agentLabelSelector:
matchLabels: {}
release:
image: quay.io/openshift-release-dev/ocp-release:4.14.1-multi
image: quay.io/openshift-release-dev/ocp-release:4.15.6-multi
---
apiVersion: cluster.open-cluster-management.io/v1
kind: ManagedCluster
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plan: management-cluster
force: false
version: stable
tag: "4.14.6"
tag: "4.15.10"
cluster: "management"
domain: hypershift.lab
api_ip: 192.168.125.10
Expand Down
4 changes: 2 additions & 2 deletions site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ content:
sources:
- url: ./
branches:
- 'lab-4.14'
- 'lab-4.15'
start_path: documentation

asciidoc:
attributes:
release-version: 4.14
release-version: 4.15
page-pagination: true
extensions:
- ./lib/tab-block.js
Expand Down

0 comments on commit 2347815

Please sign in to comment.