VZ-10227 ocne upgrade to 1.7 (#64)

* VZ-10227: Support for OCNE1.7
verrazzano · Jul 28, 2023 · 5cdb592 · 5cdb592
1 parent 3269231
commit 5cdb592
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 3 deletions.
diff --git a/bootstrap/ocne/config/default/manager_pull_policy.yaml b/bootstrap/ocne/config/default/manager_pull_policy.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
diff --git a/controlplane/ocne/config/default/manager_pull_policy.yaml b/controlplane/ocne/config/default/manager_pull_policy.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
diff --git a/internal/util/ocne/ocne.go b/internal/util/ocne/ocne.go
@@ -184,7 +184,7 @@ func GetOCNEOverrides(userData *OCNEOverrideData) ([]string, error) {
 
 	ocneDependenciesInstall := []string{
 		`sudo dnf install -y oracle-olcne-release-el8`,
-		`sudo dnf config-manager --enable ol8_olcne16 ol8_olcne15 ol8_addons ol8_baseos_latest ol8_appstream ol8_UEKR6`,
+		`sudo dnf config-manager --enable ol8_olcne17 ol8_olcne16 ol8_olcne15 ol8_addons ol8_baseos_latest ol8_appstream ol8_UEKR6`,
 		`sudo dnf config-manager --disable ol8_olcne14 ol8_olcne13 ol8_olcne12 ol8_developer`,
 		fmt.Sprintf("sudo dnf install -y kubelet-%s.el8 kubeadm-%s.el8 kubectl-%s.el8 helm-%s.el8", ocneMeta[userData.KubernetesVersion].OCNEPackages.Kubelet, ocneMeta[userData.KubernetesVersion].OCNEPackages.Kubeadm, ocneMeta[userData.KubernetesVersion].OCNEPackages.Kubectl, ocneMeta[userData.KubernetesVersion].OCNEPackages.Helm),
 		`sudo dnf install -y oraclelinux-developer-release-el8 python36-oci-cli olcnectl olcne-api-server olcne-utils`,

diff --git a/kubernetes-versions.yaml b/kubernetes-versions.yaml
@@ -315,3 +315,42 @@
     kubectl: 1.25.7-1
     kubelet: 1.25.7-1
     helm: 3.11.1-1
+1.25.11:
+  container-images:
+    pause: 3.8
+    etcd: 3.5.6
+    coredns: v1.9.3
+    kube-controller-manager: v1.25.11
+    kube-scheduler: v1.25.11
+    kube-apiserver: v1.25.11
+    kube-proxy: v1.25.11
+  packages:
+    kubeadm: 1.25.11-1
+    kubectl: 1.25.11-1
+    kubelet: 1.25.11-1
+    helm: 3.11.1-1
+  extra-images:
+    kubernetes-dashboard: v2.5.1
+    flannel: v0.14.1
+    nginx: 1.17.7
+    externalip-webhook: v1.0.0-1
+1.26.6:
+  container-images:
+    pause: 3.9
+    etcd: 3.5.6
+    coredns: v1.9.3
+    kube-controller-manager: v1.26.6
+    kube-scheduler: v1.26.6
+    kube-apiserver: v1.26.6
+    kube-proxy: v1.26.6
+  packages:
+    kubeadm: 1.26.6-1
+    kubectl: 1.26.6-1
+    kubelet: 1.26.6-1
+    helm: 3.12.0-1
+  extra-images:
+    kubernetes-dashboard: v2.5.1
+    flannel: v0.14.1
+    nginx: 1.17.7
+    externalip-webhook: v1.0.0-1
+    module-operator: v1.7.0
diff --git a/metadata.yaml b/metadata.yaml
@@ -11,4 +11,7 @@ kind: Metadata
 releaseSeries:
   - major: 1
     minor: 6
+    contract: v1beta1
+  - major: 1
+    minor: 7
     contract: v1beta1
diff --git a/util/ocne/versions.go b/util/ocne/versions.go
@@ -52,6 +52,8 @@ const (
 )
 
 var k8s_ocne_version_maping = map[string]string{
+	"v1.26.6":  "1.7",
+	"v1.25.11": "1.6",
 	"v1.25.7":  "1.6",
 	"v1.24.8":  "1.5",
 	"v1.24.5":  "1.5",