Skip to content

NO-ISSUE: rebase-release-4.19-4.19.0-0.nightly-2025-07-16-160211_amd64-2025-07-16_arm64-2025-07-16 #5217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 5 commits into from
Jul 17, 2025
Merged

NO-ISSUE: rebase-release-4.19-4.19.0-0.nightly-2025-07-16-160211_amd64-2025-07-16_arm64-2025-07-16 #5217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc0f29b
update last_rebase.sh
pacevedom Jul 17, 2025
6eb3f1f
update changelog
pacevedom Jul 17, 2025
355db62
update manifests
pacevedom Jul 17, 2025
196ac05
update buildfiles
pacevedom Jul 17, 2025
a3d3738
fix path traversal vulnerability
pacevedom Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-07-11-044827
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-07-16-185458
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.19.0-0.nightly-2025-07-10-061759
OCP_VERSION := 4.19.0-0.nightly-2025-07-16-160211
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-07-11-044827"
"base": "4.19.0-0.nightly-arm64-2025-07-16-185458"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72a3e7029fb6ab149963daaa51e5501db84c9f16dbe5655a2ed7be00bbad2d4c",
Expand Down
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-07-10-061759"
"base": "4.19.0-0.nightly-2025-07-16-160211"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75f8adef2ed9e5a4c428990e6b6b22f0293e19d2e83e8543626d17c3eec7b696",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/release-kube-proxy-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-07-11-044827"
"base": "4.19.0-0.nightly-arm64-2025-07-16-185458"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de5ccb134977b7a40f4d12f493a7a2823c302721f8c6d0303a663bbb01748c08"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/release-kube-proxy-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-07-10-061759"
"base": "4.19.0-0.nightly-2025-07-16-160211"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5dc91a4ed96111b7908f35a242fed7e6c0652a5247791e22911eb134f39d6f67"
Expand Down
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3b553e5c258de186195c4c6d2da243a06cf44727c4e701818bc96de0f9d082a3
digest: sha256:fecce1eeb782bd267072c9315afd89da2d03c7ad7a33713f6f3703dd480f8102
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:c0847c52711c8a36c594b57270270028562ea965ba3b0910ef53ae2183092b5d
digest: sha256:65e50fe6399bc1b0052d47a2e7e0ba7a083c28e6a8b98a77613ad0d796215fe1
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:5baa4a0ae51c34579b7866d103217f36feaada6ea42539da9b8c311122a3a104
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0847c52711c8a36c594b57270270028562ea965ba3b0910ef53ae2183092b5d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65e50fe6399bc1b0052d47a2e7e0ba7a083c28e6a8b98a77613ad0d796215fe1
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b553e5c258de186195c4c6d2da243a06cf44727c4e701818bc96de0f9d082a3
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fecce1eeb782bd267072c9315afd89da2d03c7ad7a33713f6f3703dd480f8102
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:2f3613780ee10a9ea351b1490b339db4533b2ad70798854e9acecbfcf7aaf173
digest: sha256:f2bc5c8f2c9d515f74834d57b32c27f117cae11f0c7a18d76699922cc77d765e
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:35e8f6b0403ec48111c8b10c694d327e4c27f51673397add3ef856c7c1b963d8
digest: sha256:98c9c3332f7523b2db538bb62d362bd64564c5204c4061226f3a2c2b3ee98e68
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:971174692a1aae68ac07ffa132254eb3c018a52507eb32621b6dc286fd25ca0d
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35e8f6b0403ec48111c8b10c694d327e4c27f51673397add3ef856c7c1b963d8
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98c9c3332f7523b2db538bb62d362bd64564c5204c4061226f3a2c2b3ee98e68
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f3613780ee10a9ea351b1490b339db4533b2ad70798854e9acecbfcf7aaf173
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f2bc5c8f2c9d515f74834d57b32c27f117cae11f0c7a18d76699922cc77d765e
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-07-11-044827"
"base": "4.19.0-0.nightly-arm64-2025-07-16-185458"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b553e5c258de186195c4c6d2da243a06cf44727c4e701818bc96de0f9d082a3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0847c52711c8a36c594b57270270028562ea965ba3b0910ef53ae2183092b5d",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fecce1eeb782bd267072c9315afd89da2d03c7ad7a33713f6f3703dd480f8102",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65e50fe6399bc1b0052d47a2e7e0ba7a083c28e6a8b98a77613ad0d796215fe1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5baa4a0ae51c34579b7866d103217f36feaada6ea42539da9b8c311122a3a104"
}
}
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-07-10-061759"
"base": "4.19.0-0.nightly-2025-07-16-160211"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f3613780ee10a9ea351b1490b339db4533b2ad70798854e9acecbfcf7aaf173",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35e8f6b0403ec48111c8b10c694d327e4c27f51673397add3ef856c7c1b963d8",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f2bc5c8f2c9d515f74834d57b32c27f117cae11f0c7a18d76699922cc77d765e",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98c9c3332f7523b2db538bb62d362bd64564c5204c4061226f3a2c2b3ee98e68",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:971174692a1aae68ac07ffa132254eb3c018a52507eb32621b6dc286fd25ca0d"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-07-11-044827"
"base": "4.19.0-0.nightly-arm64-2025-07-16-185458"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55c07486718716ec52320e42e3d14990f4b4863f7d3a56da21b969790a32cf45",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d48b41f91556b6e9e949aae2bd024b4815dd492927ead70aa9e9c6f8e1261e7d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c48d65a845d322c587a10d527877f1ea654fb1d92b2578f59baffe6824c2d45b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5baa4a0ae51c34579b7866d103217f36feaada6ea42539da9b8c311122a3a104",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aeb3cb4c254b63396717e62d7e4e208477b44bf6683b6218a7ccaf75bac1733f",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4df8e4f967fc8ced6386fd9e7c498ce5a51c95d3b1385ba5bd527205d5d6b80",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fa6290de6a96c9fcd3c641782b08aad8aabd0c79a17d204ca5204038eb92cad4",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff994bf0f29d22aad79ea8ab1871a53633ab5849bb53d1855e83991fa1be0e17",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:03771d66c0ed8a422c012ffaf6f390d8c3191e02330ef9b9dee00af518928d6e",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-07-10-061759"
"base": "4.19.0-0.nightly-2025-07-16-160211"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:457d82eb181032777f0c581c04bec74fe33d37a412d695ad69d0cef54e75a1d7",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbb737de5155ae94dad2b950105ec525cd2c4dc048a570dca33c389c80bf1228",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:363b6ef1ef0143febd564f0be09ce8668de615dc93c47e78335f0115773063a6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:971174692a1aae68ac07ffa132254eb3c018a52507eb32621b6dc286fd25ca0d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e331eec77de8e5dc94e554ab499af509c3193e1d9d5733590c373ccfe20aefa",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4d644266ade4bf992aadd0c1d6fce7901f3d32d77777b191efcd6140322dada",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db230ce535ebafb9adb365e557a6c9f0cfda932739e541b7b374b6f4b11108c6",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee47ef3d6bcb3d28dc1e939dd96acecbdf21e3c86ea30a8a20628a6858e78345",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:c5f0ad26372afdd4d3e6a37fdb5cdf0c91304c0e994ec885e2db89e851081504",
Expand Down
29 changes: 18 additions & 11 deletions pkg/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,24 +597,31 @@ func cleanupStaleKubeconfigs(cfg *config.Config, path string) error {
for _, name := range append(cfg.ApiServer.SubjectAltNames, cfg.Node.HostnameOverride) {
currentKubeconfigs[name] = struct{}{}
}
files, err := os.ReadDir(path)
dirs, err := os.ReadDir(path)
if err != nil {
return err
}
deleteDirs := make([]string, 0)
for _, file := range files {
if !file.IsDir() {
for _, dir := range dirs {
if !dir.IsDir() {
continue
}
if _, ok := currentKubeconfigs[file.Name()]; !ok {
deleteDirs = append(deleteDirs, filepath.Join(path, file.Name()))

originalName := dir.Name()
cleanName := filepath.Base(originalName)

if cleanName != originalName || cleanName == ".." {
klog.Warningf("Skipping directory with potentially malicious name: %s", originalName)
continue
}
}
for _, deletePath := range deleteDirs {
if err := os.RemoveAll(filepath.Clean(deletePath)); err != nil {
klog.Warningf("Unable to remove %s: %v", deletePath, err)

if _, ok := currentKubeconfigs[cleanName]; !ok {
kubeConfigPath := filepath.Join(path, cleanName)
if err := os.RemoveAll(kubeConfigPath); err != nil {
klog.Warningf("Unable to remove %s: %v", kubeConfigPath, err)
} else {
klog.Infof("Removed stale kubeconfig %s", kubeConfigPath)
}
}
klog.Infof("Removed stale kubeconfig %s", deletePath)
}
return nil
}
Loading