Merge branch 'openshift:main' into master

Author: midu16

.snyk

@@ -5,6 +5,10 @@ exclude:
   global:
     - vendor/**
     - "**/*_test.go"
+    - pkg/cli/admin/internal/codesign/machoresign.go # the paths are fed by oc
+    - pkg/cli/admin/release/new.go # we sanitize the directory
+    - pkg/cli/rsync/copy_tar.go # mostly directories are determined by oc
+    - pkg/helpers/source-to-image/tar/tar.go # we sanitize the directory
     - pkg/cli/image/archive/archive.go # this is copy of moby/moby/pkg/archive and making any changes is risky that may create uneasy to find bugs.
     - pkg/cli/admin/inspect/util.go # InsecureSkipVerify is required to show the event page which is managed by CI jobs.
     - pkg/cli/admin/release/git.go  # md5 is used to generate repo name in remoteNameForRepo func and to be compatible with git, md5 is required.

README.md

@@ -11,10 +11,8 @@ OpenShift cluster.
 
 All contributions are welcome - oc uses the Apache 2 license and does not require
 any contributor agreement to submit patches.  Please open issues for any bugs
-or problems you encounter, ask questions on the OpenShift IRC channel
-(#openshift-dev on freenode), or get involved in the [kubectl](https://github.com/kubernetes/kubectl)
-and [kubernetes project](https://github.com/kubernetes/kubernetes) at the container
-runtime layer.
+or problems you encounter. You can also get involved with the [kubectl](https://github.com/kubernetes/kubectl)
+and the [Kubernetes project](https://github.com/kubernetes/kubernetes).
 
 ## Building
 

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2
 	github.com/alessio/shellescape v1.4.1
-	github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74
+	github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa
 	github.com/alicebob/sqlittle v1.4.0
 	github.com/apcera/gssapi v0.0.0-00010101000000-000000000000
 	github.com/aws/aws-sdk-go v1.55.7
@@ -24,7 +24,7 @@ require (
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/fsouza/go-dockerclient v1.10.0
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-ldap/ldap/v3 v3.4.3
+	github.com/go-ldap/ldap/v3 v3.4.11
 	github.com/gonum/graph v0.0.0-20170401004347-50b27dea7ebb
 	github.com/google/go-cmp v0.7.0
 	github.com/int128/oauth2cli v1.17.0
@@ -37,19 +37,19 @@ require (
 	github.com/openshift/api v0.0.0-20250710082954-674ad74beffc
 	github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c
 	github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
-	github.com/openshift/library-go v0.0.0-20250711143941-47604345e7ea
+	github.com/openshift/library-go v0.0.0-20250911074910-e2c18d5abc3a
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/prometheus/client_golang v1.22.0
 	github.com/russross/blackfriday v1.6.0
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.7
 	github.com/vincent-petithory/dataurl v1.0.0
-	golang.org/x/crypto v0.40.0
-	golang.org/x/net v0.42.0
+	golang.org/x/crypto v0.42.0
+	golang.org/x/net v0.43.0
 	golang.org/x/oauth2 v0.30.0
-	golang.org/x/sync v0.16.0
-	golang.org/x/sys v0.34.0
-	golang.org/x/term v0.33.0
+	golang.org/x/sync v0.17.0
+	golang.org/x/sys v0.36.0
+	golang.org/x/term v0.35.0
 	k8s.io/api v0.33.3
 	k8s.io/apiextensions-apiserver v0.33.3
 	k8s.io/apimachinery v0.33.3
@@ -66,7 +66,7 @@ require (
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
-	github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e // indirect
+	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
 	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -89,7 +89,7 @@ require (
 	github.com/fatih/camelcase v1.0.0 // indirect
 	github.com/felixge/fgprof v0.9.4 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.6.1 // indirect
@@ -179,9 +179,9 @@ require (
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
-	golang.org/x/text v0.27.0 // indirect
+	golang.org/x/text v0.29.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
-	golang.org/x/tools v0.34.0 // indirect
+	golang.org/x/tools v0.36.0 // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect