Updates for 4.7

kevchu3 · Apr 9, 2021 · 03af593 · 03af593
1 parent eccde8c
commit 03af593
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -51,9 +51,9 @@ For this step, "Creating Red Hat Enterprise Linux CoreOS (RHCOS) machines using
   * In RHEV, I created the VMs for the bootstrap, control plane, and compute nodes.
   * For disks, I used Preallocated for the masters and Thin Provisioning for the bootstrap and compute nodes.  The etcd database on masters is I/O intensive and thus Preallocated is recommended.
   * While creating the VMs booted from CD-ROM using a downloaded version of this ISO locally hosted in RHEV:
+    * OpenShift 4.7 - https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.7/4.7.0/rhcos-4.7.0-x86_64-live.x86_64.iso
     * OpenShift 4.6 - https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.6/4.6.1/rhcos-4.6.1-x86_64-live.x86_64.iso
     * OpenShift 4.5 - https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.5/4.5.2/rhcos-4.5.2-x86_64-installer.x86_64.iso
-    * OpenShift 4.4 - https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.4/4.4.3/rhcos-4.4.3-x86_64-installer.x86_64.iso
 
 ### 4. Configure DHCP
 

diff --git a/template/multitenant-network-policy.yaml b/template/multitenant-network-policy.yaml
@@ -30,7 +30,7 @@ objects:
     kind: User
     name: ${PROJECT_ADMIN_USER}
 # Set multitenant network policy
-# https://docs.openshift.com/container-platform/4.6/networking/network_policy/default-network-policy.html
+# https://docs.openshift.com/container-platform/latest/networking/network_policy/default-network-policy.html
 - apiVersion: networking.k8s.io/v1
   kind: NetworkPolicy
   metadata:

diff --git a/template/multitenant-project-template.yaml b/template/multitenant-project-template.yaml
@@ -30,7 +30,7 @@ objects:
     kind: User
     name: ${PROJECT_ADMIN_USER}
 # Set multitenant network policy
-# https://docs.openshift.com/container-platform/4.6/networking/network_policy/default-network-policy.html
+# https://docs.openshift.com/container-platform/latest/networking/network_policy/default-network-policy.html
 - apiVersion: networking.k8s.io/v1
   kind: NetworkPolicy
   metadata:
@@ -67,16 +67,16 @@ objects:
     policyTypes:
     - Ingress
 # Set resource quotas per project
-# https://docs.openshift.com/container-platform/4.6/applications/quotas/quotas-setting-per-project.html
-- apiVersion: v1
-  kind: ResourceQuota
-  metadata:
-    name: compute
-  spec:
-    hard:
-      requests.cpu: "4"
-      requests.memory: 24Gi
-      limits.memory: 24Gi
+# https://docs.openshift.com/container-platform/latest/applications/quotas/quotas-setting-per-project.html
+apiVersion: v1
+kind: ResourceQuota
+metadata:
+  name: compute
+spec:
+  hard:
+    requests.cpu: 4
+    requests.memory: 24Gi
+    limits.memory: 24Gi
 # Set limit range so that pods fit within quota
 # https://docs.openshift.com/container-platform/latest/nodes/clusters/nodes-cluster-limit-ranges.html
 - apiVersion: v1