Merge pull request #739 from ingvagabund/sync-library-go

OCPBUGS-14323: Change manifest directory permissions
openshift · Jun 1, 2023 · 1e15498 · 1e15498
2 parents f573500 + b05a7f6
commit 1e15498
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/openshift/api v0.0.0-20230509100629-894b49f57a15
 	github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
 	github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb
-	github.com/openshift/library-go v0.0.0-20230510144506-e749b54aff20
+	github.com/openshift/library-go v0.0.0-20230531082824-be85f8400975
 	github.com/prometheus/client_golang v1.14.0
 	github.com/prometheus/common v0.37.0
 	github.com/spf13/cobra v1.6.0

diff --git a/go.sum b/go.sum
@@ -437,8 +437,8 @@ github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR
 github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb h1:Nij5OnaECrkmcRQMAE9LMbQXPo95aqFnf+12B7SyFVI=
 github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb/go.mod h1:Rhb3moCqeiTuGHAbXBOlwPubUMlOZEkrEWTRjIF3jzs=
-github.com/openshift/library-go v0.0.0-20230510144506-e749b54aff20 h1:BfL2/x2Z/N3Wc1AhovvZ1pWStxwTuQdo6A84NPhSTvY=
-github.com/openshift/library-go v0.0.0-20230510144506-e749b54aff20/go.mod h1:PJVatR/oS/EaFciwylyAr9hORSqQHrC+5bXf4L0wsBY=
+github.com/openshift/library-go v0.0.0-20230531082824-be85f8400975 h1:2VCANToEsHDYhwYCRnwE72qp+fA6qX6od5n6JHT4xfM=
+github.com/openshift/library-go v0.0.0-20230531082824-be85f8400975/go.mod h1:PJVatR/oS/EaFciwylyAr9hORSqQHrC+5bXf4L0wsBY=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=

diff --git a/pkg/cmd/render/render_test.go b/pkg/cmd/render/render_test.go
@@ -362,7 +362,7 @@ func TestRenderCommand(t *testing.T) {
 				"--cpc-config-output-file=",
 				"--payload-version=test",
 			},
-			expectedErr: errors.New("--rendered-manifest-files, are not consistent so results would be unpredictable depending on apply order: \"featuregate-custom.yaml\" and \"featuregate.yaml\" both set FeatureGate.config.openshift.io/cluster in ns/, but have different values"),
+			expectedErr: errors.New("--rendered-manifest-files, are not consistent so results would be unpredictable depending on apply order: \"testdata/rendered/mismatched-fg/featuregate-custom.yaml\" and \"testdata/rendered/mismatched-fg/featuregate.yaml\" both set FeatureGate.config.openshift.io/cluster in ns/, but have different values"),
 		},
 	}
 

diff --git a/vendor/github.com/openshift/library-go/pkg/operator/render/options/generic.go b/vendor/github.com/openshift/library-go/pkg/operator/render/options/generic.go
diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/installerpod/cmd.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/installerpod/cmd.go
diff --git a/vendor/github.com/openshift/library-go/pkg/operator/status/status_controller.go b/vendor/github.com/openshift/library-go/pkg/operator/status/status_controller.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -303,7 +303,7 @@ github.com/openshift/client-go/route/applyconfigurations/route/v1
 github.com/openshift/client-go/route/clientset/versioned
 github.com/openshift/client-go/route/clientset/versioned/scheme
 github.com/openshift/client-go/route/clientset/versioned/typed/route/v1
-# github.com/openshift/library-go v0.0.0-20230510144506-e749b54aff20
+# github.com/openshift/library-go v0.0.0-20230531082824-be85f8400975
 ## explicit; go 1.20
 github.com/openshift/library-go/pkg/assets
 github.com/openshift/library-go/pkg/authorization/hardcodedauthorizer