Merge pull request #226 from openshift/m-oct22

Update master branch for 4.10

.github/dependabot.yaml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "gitsubmodules"
+    directory: "/"
+    schedule:
+      interval: "daily"

.gitmodules

@@ -1,6 +1,8 @@
 [submodule "fedora-coreos-config"]
 	path = fedora-coreos-config
 	url = https://github.com/coreos/fedora-coreos-config.git
+	branch = "testing-devel"
 [submodule "openshift-os"]
 	path = openshift-os
 	url = https://github.com/openshift/os
+	branch = "master"

Dockerfile.cosa

@@ -1,5 +1,5 @@
-FROM quay.io/openshift/origin-machine-config-operator:4.9 as mcd
-FROM registry.ci.openshift.org/origin/4.9:artifacts as artifacts
+FROM quay.io/openshift/origin-machine-config-operator:4.10 as mcd
+FROM registry.ci.openshift.org/origin/4.10:artifacts as artifacts
 
 FROM quay.io/coreos-assembler/coreos-assembler:latest AS build
 USER 1000

Dockerfile.template

@@ -6,5 +6,5 @@ COPY manifests/ /manifests/
 COPY bootstrap/ /bootstrap/
 LABEL io.openshift.release.operator=true \
       io.openshift.build.version-display-names="machine-os=Fedora CoreOS" \
-      io.openshift.build.versions="machine-os=49.34.0"
+      io.openshift.build.versions="machine-os=410.34.0"
 ENTRYPOINT ["/noentry"]

manifest-lock.overrides.yaml

@@ -14,3 +14,18 @@ packages:
     metadata:
       reason: https://bugzilla.redhat.com/show_bug.cgi?id=1980693
       type: pin
+  kernel:
+    evr: 5.13.14-200.fc34
+    metadata:
+      reason: crashes on m6i.xlarge
+      type: pin
+  kernel-core:
+    evr: 5.13.14-200.fc34
+    metadata:
+      reason: crashes on m6i.xlarge
+      type: pin
+  kernel-modules:
+    evr: 5.13.14-200.fc34
+    metadata:
+      reason: crashes on m6i.xlarge
+      type: pin

manifest.yaml

@@ -34,10 +34,10 @@ packages:
   - fedora-coreos-pinger
 
 # We include hours/minutes to avoid version number reuse
-automatic-version-prefix: "49.34.<date:%Y%m%d%H%M>"
+automatic-version-prefix: "410.34.<date:%Y%m%d%H%M>"
 # This ensures we're semver-compatible which OpenShift wants
 automatic-version-suffix: "-"
-mutate-os-release: "4.9"
+mutate-os-release: "4.10"
 
 documentation: false