openshift · trozet · Jun 4, 2025
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.23-openshift-4.19
+  tag: rhel-9-release-golang-1.22-openshift-4.18
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -54,25 +54,3 @@ aliases:
   - umohnani8 # Container Engine Tools
   - davidvossel # HyperShift on KubeVirt Platform
   - orenc1 # HyperShift on KubeVirt Platform
-  network-ingress-dns-test-case-approvers:
-  - frobware
-  - knobunc
-  - Miciah
-  - miheer
-  - alebedev87
-  - candita
-  - gcs278
-  - rfredette
-  - Thealisyed
-  - grzpiotrowski
-  network-ingress-dns-test-case-reviewers:
-  - frobware
-  - knobunc
-  - Miciah
-  - miheer
-  - alebedev87
-  - candita
-  - gcs278
-  - rfredette
-  - Thealisyed
-  - grzpiotrowski
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ This repo was previously the core Kubernetes tracking repo for
 2020, the purpose and maintenance strategy of the repo varies by
 branch.
 
-## Maintenance of `main` and `release-x.x` branches for 4.6 and above
+## Maintenance of `master` and `release-x.x` branches for 4.6 and above
 
 These branches no longer include the code required to produce
 `hyperkube` binaries, and are limited to maintaining the `openshift-tests`
@@ -27,9 +27,9 @@ to `origin` that bumps the vendoring.
 Branch names are correlated across the 2 repositories such that
 changes merged to a given branch in `openshift/kubernetes` should be
 vendored into the same branch in `origin` (e.g. `master` in
-`openshift/kubernetes` is vendored into `main` in `origin`).
+`openshift/kubernetes` is vendored into `master` in `origin`).
 
-**NOTE:** Vendoring of the `main` and `release-x.x` branches of
+**NOTE:** Vendoring of the `master` and `release-x.x` branches of
 `openshift/kubernetes` into the equivalent branches in `origin` is
 intended to be temporary. At some point in the near future, `origin`
 will switch to vendoring origin-specific branches (e.g
@@ -55,7 +55,7 @@ https://github.com/openshift/kubernetes/blob/master/openshift-hack/e2e/annotate/
 
 Test annotation rules for openshift e2e tests are maintained in:
 
-https://github.com/openshift/origin/blob/main/test/extended/util/annotate/rules.go
+https://github.com/openshift/origin/blob/master/test/extended/util/annotate/rules.go
 
 Origin vendors the kube rules and applies both the kube and openshift
 rules to the set of tests included in the `openshift-tests` binary.
@@ -136,7 +136,7 @@ All e2e tests are compiled into the `openshift-tests` binary.
 To build the test binary, run `make`.
 
 To run a specific test, or an entire suite of tests, read
-[test/extended/README](https://github.com/openshift/origin/blob/main/test/extended/README.md)
+[test/extended/README](https://github.com/openshift/origin/blob/master/test/extended/README.md)
 for more information.
 
 ## Updating external examples

diff --git a/docs/cli.md b/docs/cli.md
@@ -640,7 +640,7 @@ In both cases, the top-level field is `spec` and its value is another map expres
 This processes a Template into a valid Config resource. The processing
 will take care of generating values for parameters specified in the Template and
 substituting the values in the corresponding places. An example Template can be
-found in [examples/sample-app/application-template-stibuild.json](https://github.com/openshift/origin/blob/main/examples/sample-app/application-template-stibuild.json).
+found in [examples/sample-app/application-template-stibuild.json](https://github.com/openshift/origin/blob/master/examples/sample-app/application-template-stibuild.json).
 
 ```bash
 $ oc process -f examples/sample-app/application-template-stibuild.json > config.json

diff --git a/docs/cli_hacking_guide.adoc b/docs/cli_hacking_guide.adoc
@@ -18,14 +18,14 @@ We make use of https://github.com/spf13/cobra[Cobra] and https://github.com/spf1
 
 Commands are organized in the package structure as:
 
-* https://github.com/openshift/origin/tree/main/pkg/cmd[pkg/cmd]
-** https://github.com/openshift/origin/tree/main/pkg/cmd/openshift[pkg/cmd/openshift] - `openshift` or `origin` command.
-** https://github.com/openshift/origin/tree/main/pkg/cmd/infra[pkg/cmd/infra]
-*** https://github.com/openshift/origin/tree/main/pkg/cmd/infra/deployer[pkg/cmd/infra/deployer] - `openshift-deploy` command.
-
-* https://github.com/openshift/origin/tree/main/pkg/oc[pkg/oc]
-** https://github.com/openshift/origin/tree/main/pkg/oc/cli[pkg/oc/cli] - `oc` and `kubectl` commands.
-** https://github.com/openshift/origin/tree/main/pkg/oc/cli/experimental[pkg/oc/cli/experimental] - `oc ex` command.
+* https://github.com/openshift/origin/tree/master/pkg/cmd[pkg/cmd]
+** https://github.com/openshift/origin/tree/master/pkg/cmd/openshift[pkg/cmd/openshift] - `openshift` or `origin` command.
+** https://github.com/openshift/origin/tree/master/pkg/cmd/infra[pkg/cmd/infra]
+*** https://github.com/openshift/origin/tree/master/pkg/cmd/infra/deployer[pkg/cmd/infra/deployer] - `openshift-deploy` command.
+
+* https://github.com/openshift/origin/tree/master/pkg/oc[pkg/oc]
+** https://github.com/openshift/origin/tree/master/pkg/oc/cli[pkg/oc/cli] - `oc` and `kubectl` commands.
+** https://github.com/openshift/origin/tree/master/pkg/oc/cli/experimental[pkg/oc/cli/experimental] - `oc ex` command.
 
 === Command Structure
 

diff --git a/docs/proposals/image-promotion.md b/docs/proposals/image-promotion.md
@@ -93,7 +93,7 @@ based on the verification results.
 
 #### Example of using Jenkins
 
-As a user I have a Jenkins server running in my project by following the instructions from the [Jenkins example](https://github.com/openshift/origin/blob/main/examples/jenkins/README.md).
+As a user I have a Jenkins server running in my project by following the instructions from the [Jenkins example](https://github.com/openshift/origin/blob/master/examples/jenkins/README.md).
 Then I create the *frontend-production* DeploymentConfig in my *Prod* project.
 
 This DeploymentConfig has the ImageChangeTrigger set to watch changes in the "prod-ready" ImageStreamTag:

diff --git a/e2echart/e2e-chart-template.html b/e2echart/e2e-chart-template.html
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>EVENT_INTERVAL_TITLE_GOES_HERE</title>
-    <script src="https://cdn.jsdelivr.net/npm/timelines-chart"></script>
+    <script src="https://unpkg.com/timelines-chart"></script>
     <script src="https://d3js.org/d3-array.v1.min.js"></script>
     <script src="https://d3js.org/d3-collection.v1.min.js"></script>
     <script src="https://d3js.org/d3-color.v1.min.js"></script>
@@ -101,11 +101,6 @@ <h5 class="modal-title">Resource</h5>
 
     }
 
-    function isEtcdBootstrap(eventInterval) {
-        return eventInterval.source === 'PodLog' && eventInterval.message.reason === "EtcdBootstrap";
-
-    }
-
     function isPodLog(eventInterval) {
         if (eventInterval.source === 'PodLog') {
             return true
@@ -147,10 +142,6 @@ <h5 class="modal-title">Resource</h5>
         return (eventInterval.source === "APIUnreachableFromClient")
     }
 
-    function isStaticPodInstallMonitorActivity(eventInterval) {
-        return (eventInterval.source === "StaticPodInstallMonitor")
-    }
-
     function isEndpointConnectivity(eventInterval) {
         if (eventInterval.message.reason !== "DisruptionBegan" && eventInterval.message.reason !== "DisruptionSamplerOutageBegan") {
             return false
@@ -281,10 +272,6 @@ <h5 class="modal-title">Resource</h5>
         return [buildLocatorDisplayString(item.locator), "", "APIUnreachableFromClientMetrics"]
     }
 
-    function isStaticPodInstallMonitorValue(item) {
-        return [buildLocatorDisplayString(item.locator), "", item.message.reason]
-    }
-
     function disruptionValue(item) {
         // We classify these disruption samples with this message if it thinks
         // it looks like a problem in the CI cluster running the tests, not the cluster under test.
@@ -500,12 +487,8 @@ <h5 class="modal-title">Resource</h5>
         timelineGroups.push({group: "api-unreachable", data: []})
         createTimelineData(isAPIUnreachableFromClientValue, timelineGroups[timelineGroups.length - 1].data, eventIntervals, isAPIUnreachableFromClientActivity, regex)
 
-        timelineGroups.push({group: "staticpod-install", data: []})
-        createTimelineData(isStaticPodInstallMonitorValue, timelineGroups[timelineGroups.length - 1].data, eventIntervals, isStaticPodInstallMonitorActivity, regex)
-
         timelineGroups.push({ group: "etcd-leaders", data: [] })
         createTimelineData(etcdLeadershipLogsValue, timelineGroups[timelineGroups.length - 1].data, eventIntervals, isEtcdLeadershipAndNotEmpty, regex)
-        createTimelineData("Bootstrap", timelineGroups[timelineGroups.length - 1].data, eventIntervals, isEtcdBootstrap, regex)
 
         timelineGroups.push({group: "cloud-metrics", data: []})
         createTimelineData(cloudMetricsValue, timelineGroups[timelineGroups.length - 1].data, eventIntervals, isCloudMetrics, regex)

diff --git a/e2echart/non-spyglass-e2e-chart-template.html b/e2echart/non-spyglass-e2e-chart-template.html
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>EVENT_INTERVAL_TITLE_GOES_HERE</title>
-    <script src="https://cdn.jsdelivr.net/npm/timelines-chart"></script>
+    <script src="https://unpkg.com/timelines-chart"></script>
     <script src="https://d3js.org/d3-array.v1.min.js"></script>
     <script src="https://d3js.org/d3-collection.v1.min.js"></script>
     <script src="https://d3js.org/d3-color.v1.min.js"></script>

diff --git a/examples/db-templates/README.md b/examples/db-templates/README.md
@@ -37,7 +37,7 @@ your current project. Instantiate a new database service with this command:
 Replace `/path/to/template.json` with an appropriate path, that can be either a
 local path or an URL. Example:
 
-    $ oc new-app https://raw.githubusercontent.com/openshift/origin/main/examples/db-templates/mariadb-ephemeral-template.json
+    $ oc new-app https://raw.githubusercontent.com/openshift/origin/master/examples/db-templates/mariadb-ephemeral-template.json
 
 The parameters listed in the output above can be tweaked by specifying values in
 the command line with the `-p` option:
@@ -59,7 +59,7 @@ later. Create the template with this command:
 Replace `/path/to/template.json` with an appropriate path, that can be either a
 local path or an URL. Example:
 
-    $ oc create -f https://raw.githubusercontent.com/openshift/origin/main/examples/db-templates/mariadb-ephemeral-template.json
+    $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/db-templates/mariadb-ephemeral-template.json
     template "mariadb-ephemeral" created
 
 The new template is now available to use in the Web Console or with `oc

diff --git a/examples/deployment/README.md b/examples/deployment/README.md
@@ -3,7 +3,7 @@ Deploying in OpenShift
 
 This guide demonstrates different types of deployments in OpenShift. The scenarios described below cover the main ways that applications can be updated. See the [OpenShift docs](https://docs.openshift.org/latest/dev_guide/deployments.html) for more details on managing deployments in OpenShift.
 
-The examples below assume you have cloned the OpenShift Git repository, have installed the OpenShift client tools, an OpenShift server, the OpenShift router, and have created a project. See [the Getting Started guide](https://docs.openshift.org/latest/getting_started/administrators.html) for help installing OpenShift or [CONTRIBUTING.adoc](https://github.com/openshift/origin/blob/main/CONTRIBUTING.adoc) for a more general development guide.
+The examples below assume you have cloned the OpenShift Git repository, have installed the OpenShift client tools, an OpenShift server, the OpenShift router, and have created a project. See [the Getting Started guide](https://docs.openshift.org/latest/getting_started/administrators.html) for help installing OpenShift or [CONTRIBUTING.adoc](https://github.com/openshift/origin/blob/master/CONTRIBUTING.adoc) for a more general development guide.
 
 OpenShift Deployments
 ---------------------

diff --git a/examples/grafana/README.md b/examples/grafana/README.md
@@ -9,7 +9,7 @@ It uses "OAuth" token to login openshift Prometheus.
 
 ## To run grafana and deploy dashboards
 Note: make sure to have openshift prometheus deployed (possibly, with node exporter).
-(https://github.com/openshift/origin/tree/main/examples/prometheus)
+(https://github.com/openshift/origin/tree/master/examples/prometheus)
 
 ### Run the deployment script
 ``` 
@@ -37,4 +37,4 @@ https://github.com/mrsiano/grafana-ocp
 
 #### Resources 
 - example video https://youtu.be/srCApR_J3Os
-- deploy openshift prometheus https://github.com/openshift/origin/tree/main/examples/prometheus 
+- deploy openshift prometheus https://github.com/openshift/origin/tree/master/examples/prometheus 
diff --git a/examples/hello-openshift/README.md b/examples/hello-openshift/README.md
@@ -41,7 +41,7 @@ address, and then curl will show your new message:
     $ curl 10.1.0.2:8080
      Hello World!
 
-To test from external network, you need to create router. Please refer to [Running the router](https://github.com/openshift/origin/blob/main/docs/routing.md)
+To test from external network, you need to create router. Please refer to [Running the router](https://github.com/openshift/origin/blob/master/docs/routing.md)
 
 If you need to rebuild the image:
 

diff --git a/examples/jenkins/README.md b/examples/jenkins/README.md
@@ -67,7 +67,7 @@ Some references:
 Troubleshooting
 -----
 
-If you run into difficulties running OpenShift or getting the `OpenShift Sample` job to complete successfully, start by reading through the [troubleshooting guide](https://github.com/openshift/origin/blob/main/docs/debugging-openshift.md).
+If you run into difficulties running OpenShift or getting the `OpenShift Sample` job to complete successfully, start by reading through the [troubleshooting guide](https://github.com/openshift/origin/blob/master/docs/debugging-openshift.md).
 
 Updating
 -----

diff --git a/examples/jenkins/jenkins-ephemeral-template.json b/examples/jenkins/jenkins-ephemeral-template.json
@@ -15,7 +15,7 @@
 			"tags": "instant-app,jenkins"
 		}
 	},
-	"message": "A Jenkins service has been created in your project.  Log into Jenkins with your OpenShift account.  The tutorial at https://github.com/openshift/origin/blob/main/examples/jenkins/README.md contains more information about using this template.",
+	"message": "A Jenkins service has been created in your project.  Log into Jenkins with your OpenShift account.  The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.",
 	"objects": [
 		{
 			"apiVersion": "route.openshift.io/v1",

diff --git a/examples/jenkins/jenkins-persistent-template.json b/examples/jenkins/jenkins-persistent-template.json
@@ -15,7 +15,7 @@
 			"tags": "instant-app,jenkins"
 		}
 	},
-	"message": "A Jenkins service has been created in your project.  Log into Jenkins with your OpenShift account.  The tutorial at https://github.com/openshift/origin/blob/main/examples/jenkins/README.md contains more information about using this template.",
+	"message": "A Jenkins service has been created in your project.  Log into Jenkins with your OpenShift account.  The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.",
 	"objects": [
 		{
 			"apiVersion": "route.openshift.io/v1",

diff --git a/examples/jenkins/pipeline/README.md b/examples/jenkins/pipeline/README.md
@@ -20,20 +20,20 @@ To walk through the example:
 
     If they are not present, you can create them  by running these commands as a cluster admin:
 
-        $ oc create -f https://raw.githubusercontent.com/openshift/origin/main/examples/image-streams/image-streams-centos7.json -n openshift
-        $ oc create -f https://raw.githubusercontent.com/openshift/origin/main/examples/jenkins/jenkins-ephemeral-template.json -n openshift
+        $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/image-streams/image-streams-centos7.json -n openshift
+        $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/jenkins-ephemeral-template.json -n openshift
 
     Note: If you have persistent volumes available in your cluster and prefer to use persistent storage (recommended) for your Jenkins server, register the jenkins-persistent-template.json file as well:
 
-        $ oc create -f https://raw.githubusercontent.com/openshift/origin/main/examples/jenkins/jenkins-persistent-template.json -n openshift
+        $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/jenkins-persistent-template.json -n openshift
 
 1. Create a project for your user named "pipelineproject"
 
         $ oc new-project pipelineproject
 
 1. Run this command to instantiate the template which will create a pipeline buildconfig and some other resources in your project:
 
-        $ oc new-app -f https://raw.githubusercontent.com/openshift/origin/main/examples/jenkins/pipeline/samplepipeline.yaml
+        $ oc new-app -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/pipeline/samplepipeline.yaml
 
     At this point if you run `oc get pods` you should see a jenkins pod, or at least a jenkins-deploy pod. (along with other items in your project)  This pod was created as a result of the new pipeline buildconfig being defined by the sample-pipeline template.
 
@@ -79,7 +79,7 @@ To run this example:
    3. Enter a project name
    4. Click *Create*
 3. In the *Add to Project* page, click on *Import YAML/JSON*
-4. In a separate browser tab, navigate to [maven-pipeline.yaml](https://raw.githubusercontent.com/openshift/origin/main/examples/jenkins/pipeline/maven-pipeline.yaml) and copy its content.
+4. In a separate browser tab, navigate to [maven-pipeline.yaml](https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/pipeline/maven-pipeline.yaml) and copy its content.
 5. Paste the YAML text in the text box of the *Import YAML/JSON* tab.
 6. Click on *Create*
 7. Leave *Process the template* checked and click on *Continue*
@@ -109,7 +109,7 @@ To run this example:
    3. Enter a project name
    4. Click *Create*
 3. In the *Add to Project* page, click on *Import YAML/JSON*
-4. In a separate browser tab, navigate to [bluegreen-pipeline.yaml](https://raw.githubusercontent.com/openshift/origin/main/examples/jenkins/pipeline/bluegreen-pipeline.yaml) and copy its content.
+4. In a separate browser tab, navigate to [bluegreen-pipeline.yaml](https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/pipeline/bluegreen-pipeline.yaml) and copy its content.
 5. Paste the YAML text in the text box of the *Import YAML/JSON* tab.
 6. Click on *Create*
 7. Leave *Process the template* checked and click on *Continue*
@@ -140,7 +140,7 @@ To run this example:
 
 2. Run this command to create a pipeline buildconfig in your project:
 
-        $ oc create -f https://raw.githubusercontent.com/openshift/origin/main/examples/jenkins/pipeline/openshift-client-plugin-pipeline.yaml
+        $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/pipeline/openshift-client-plugin-pipeline.yaml
 
     At this point if you run `oc get pods` you should see a jenkins pod, or at least a jenkins-deploy pod. This pod was created as a result of the new pipeline buildconfig being defined.
 
@@ -168,7 +168,7 @@ To run this example:
 
 2. Run this command to create a pipeline buildconfig in your project:
 
-        $ oc create -f https://raw.githubusercontent.com/openshift/origin/main/examples/jenkins/pipeline/nodejs-sample-pipeline.yaml
+        $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/pipeline/nodejs-sample-pipeline.yaml
 
     At this point if you run `oc get pods` you should see a jenkins pod, or at least a jenkins-deploy pod. This pod was created as a result of the new pipeline buildconfig being defined.