Skip to content

Commit f7d39a3

Browse files
authored
Merge pull request stolostron#5894 from alishaIBM/hcp_postrel_shruthi_new_2
post-release corrections
2 parents ae4ee5c + f82c18e commit f7d39a3

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

clusters/hosted_control_planes/config_dns_bm_ibmz.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ api IN A 1xx.2x.2xx.1xx <1>
2929
api-int IN A 1xx.2x.2xx.1xx
3030
;
3131
;
32-
*.apps.${HOSTED_CLUSTER_NAME}.${BASEDOMAIN} IN A 1xx.2x.2xx.1xx
32+
*.apps IN A 1xx.2x.2xx.1xx
3333
;
3434
;EOF
3535
----

clusters/hosted_control_planes/hosted_create_bare_metal.adoc

+8-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ export BASEDOMAIN="krnl.es"
1414
export PULL_SECRET_FILE=$PWD/pull-secret
1515
export MACHINE_CIDR=192.168.122.0/24
1616
export ETCD_STORAGE="lvm-storageclass"
17+
export OCP_RELEASE=4.14.0-multi
18+
export SSH_KEY=${HOME}/.ssh/id_rsa.pub
1719
oc create ns ${HOSTED_CONTROL_PLANE_NAMESPACE}
1820
1921
hcp create cluster agent \
@@ -22,7 +24,12 @@ hcp create cluster agent \
2224
--agent-namespace=${HOSTED_CONTROL_PLANE_NAMESPACE} \
2325
--base-domain=${BASEDOMAIN} \
2426
--api-server-address=api.${HOSTED_CLUSTER_NAME}.${BASEDOMAIN} \
25-
--etcd-storage-class=${ETCD_STORAGE}
27+
--etcd-storage-class=${ETCD_STORAGE} \
28+
--ssh-key ${SSH_KEY} \
29+
--namespace ${CLUSTERS_NAMESPACE} \
30+
--control-plane-availability-policy SingleReplica \
31+
--release-image=quay.io/openshift-release-dev/ocp-release:${OCP_RELEASE} \
32+
--api-server-address=api.${HOSTED_CLUSTER_NAME}.${BASEDOMAIN}
2633
----
2734

2835
+

clusters/hosted_control_planes/hosted_infraenv_ibmz.adoc

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ metadata:
1616
name: ${HOSTED_CLUSTER_NAME}
1717
namespace: ${HOSTED_CONTROL_PLANE_NAMESPACE}
1818
spec:
19+
cpuArchitecture: s390x
1920
pullSecretRef:
2021
name: pull-secret
2122
sshAuthorizedKey: ${SSH_PUB_KEY}

clusters/hosted_control_planes/scaling_nodepool_hosted_ibmz.adoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,16 @@ See the following output:
107107
[source,bash]
108108
----
109109
NAME CLUSTER NODENAME PROVIDERID PHASE AGE VERSION
110-
hosted-forwarder-79558597ff-5tbqp hosted-forwarder-crqq5 worker-zvm-0.hostedn.example.com agent://50c23cda-cedc-9bbd-bcf1-9b3a5c75804d Running 41h 4.14.0-ec.2
111-
hosted-forwarder-79558597ff-lfjfk hosted-forwarder-crqq5 worker-zvm-1.hostedn.example.com agent://5e498cd3-542c-e54f-0c58-ed43e28b568a Running 41h 4.14.0-ec.2
110+
hosted-forwarder-79558597ff-5tbqp hosted-forwarder-crqq5 worker-zvm-0.hostedn.example.com agent://50c23cda-cedc-9bbd-bcf1-9b3a5c75804d Running 41h 4.14.0
111+
hosted-forwarder-79558597ff-lfjfk hosted-forwarder-crqq5 worker-zvm-1.hostedn.example.com agent://5e498cd3-542c-e54f-0c58-ed43e28b568a Running 41h 4.14.0
112112
----
113113

114114
. Run the following command to check the cluster version:
115115

116116
+
117117
[source,bash]
118118
----
119-
oc --kubeconfig <hosted_control_plane_names>.kubeconfig get clusterversion,co
119+
oc --kubeconfig <hosted_cluster_name>.kubeconfig get clusterversion,co
120120
----
121121

122122
+
@@ -165,4 +165,4 @@ operator-lifecycle-manager-catalog 4.14.2 True False F
165165
operator-lifecycle-manager-packageserver 4.14.2 True False False 5h47m
166166
service-ca 4.14.2 True False False 5h35m
167167
storage 4.14.2 True False False 5h47m
168-
----
168+
----

0 commit comments

Comments
 (0)