Merge pull request #80 from openshift-bot/synchronize-upstream

NO-ISSUE: Synchronize From Upstream Repositories

.bingo/Variables.mk

@@ -1,4 +1,4 @@
-# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.8. DO NOT EDIT.
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.9. DO NOT EDIT.
 # All tools are designed to be build inside $GOBIN.
 BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 GOPATH ?= $(shell go env GOPATH)
@@ -53,11 +53,11 @@ $(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod
 	@echo "(re)installing $(GOBIN)/kustomize-v4.5.7"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kustomize.mod -o=$(GOBIN)/kustomize-v4.5.7 "sigs.k8s.io/kustomize/kustomize/v4"
 
-OPERATOR_SDK := $(GOBIN)/operator-sdk-v1.31.0
+OPERATOR_SDK := $(GOBIN)/operator-sdk-v1.34.1
 $(OPERATOR_SDK): $(BINGO_DIR)/operator-sdk.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/operator-sdk-v1.31.0"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -ldflags=-X=github.com/operator-framework/operator-sdk/internal/version.Version=v1.31.0 -mod=mod -modfile=operator-sdk.mod -o=$(GOBIN)/operator-sdk-v1.31.0 "github.com/operator-framework/operator-sdk/cmd/operator-sdk"
+	@echo "(re)installing $(GOBIN)/operator-sdk-v1.34.1"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -ldflags=-X=github.com/operator-framework/operator-sdk/internal/version.Version=v1.34.1 -mod=mod -modfile=operator-sdk.mod -o=$(GOBIN)/operator-sdk-v1.34.1 "github.com/operator-framework/operator-sdk/cmd/operator-sdk"
 
 OPM := $(GOBIN)/opm-v1.28.0
 $(OPM): $(BINGO_DIR)/opm.mod

.bingo/operator-sdk.mod

@@ -1,11 +1,13 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.20
+go 1.21
+
+toolchain go1.21.8
 
 replace github.com/containerd/containerd => github.com/containerd/containerd v1.4.11
 
 replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
 
 replace github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.10.0
 
-require github.com/operator-framework/operator-sdk v1.31.0 // cmd/operator-sdk -ldflags=-X=github.com/operator-framework/operator-sdk/internal/version.Version=v1.31.0
+require github.com/operator-framework/operator-sdk v1.34.1 // cmd/operator-sdk -ldflags=-X=github.com/operator-framework/operator-sdk/internal/version.Version=v1.34.1

.bingo/variables.env

@@ -1,4 +1,4 @@
-# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.8. DO NOT EDIT.
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.9. DO NOT EDIT.
 # All tools are designed to be build inside $GOBIN.
 # Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk.
 GOBIN=${GOBIN:=$(go env GOBIN)}
@@ -20,7 +20,7 @@ KIND="${GOBIN}/kind-v0.20.0"
 
 KUSTOMIZE="${GOBIN}/kustomize-v4.5.7"
 
-OPERATOR_SDK="${GOBIN}/operator-sdk-v1.31.0"
+OPERATOR_SDK="${GOBIN}/operator-sdk-v1.34.1"
 
 OPM="${GOBIN}/opm-v1.28.0"
 

PROJECT

@@ -1,6 +1,6 @@
 domain: operatorframework.io
 layout:
-- go.kubebuilder.io/v4-alpha
+- go.kubebuilder.io/v4
 projectName: operator-controller
 repo: github.com/operator-framework/operator-controller
 resources:

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: 167938e48d21b1fa129e33c42f5abf5dde266bbf
+expectedMergeBase: a817d9d4dd181146ec3539c5c852306a2ac66d4a
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

config/samples/olm_v1alpha1_extension.yaml

@@ -6,7 +6,8 @@ metadata:
 spec:
   paused: false
   serviceAccountName: extension-sa
-  defaultNamespace: extension-sample
-  package:
-    name: argocd-operator
-    version: 0.6.0
+  source:
+    sourceType: package
+    package:
+      name: argocd-operator
+      version: 0.6.0

go.mod

@@ -161,4 +161,6 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
+replace github.com/operator-framework/rukpak => github.com/openshift/operator-framework-rukpak v0.0.0-20240308020514-7589a1f04ea1
+
 replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20240221182512-9666df2685f2

go.sum

@@ -279,14 +279,14 @@ github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bl
 github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/openshift/operator-framework-catalogd v0.0.0-20240221182512-9666df2685f2 h1:yyT13hKySvcpcduEA6ZFN6po4CQGE8aSk2nkp9Zy9PY=
 github.com/openshift/operator-framework-catalogd v0.0.0-20240221182512-9666df2685f2/go.mod h1:AHz6B7NxC7cywF6P3XclmCim1bs0y0g2+LdycdIGAmE=
+github.com/openshift/operator-framework-rukpak v0.0.0-20240308020514-7589a1f04ea1 h1:gdTBoJlL+itlDgRBIcOTs84RKmRT3I9CQFU0/jASAl0=
+github.com/openshift/operator-framework-rukpak v0.0.0-20240308020514-7589a1f04ea1/go.mod h1:abntOB7EG2Ma9PQe2RLHhrmic2eGZAhnwP2zjDx/ghs=
 github.com/operator-framework/api v0.22.0 h1:UZSn+iaQih4rCReezOnWTTJkMyawwV5iLnIItaOzytY=
 github.com/operator-framework/api v0.22.0/go.mod h1:p/7YDbr+n4fmESfZ47yLAV1SvkfE6NU2aX8KhcfI0GA=
 github.com/operator-framework/deppy v0.3.0 h1:W8wpF0ehcTAdH2WfMyqMPI5Ja0Qv8M5FMO5cXgJvEQ8=
 github.com/operator-framework/deppy v0.3.0/go.mod h1:EHDxZz8fKGvuymCng3G/Ou7wuX14GaLr0cmf2u29Oog=
 github.com/operator-framework/operator-registry v1.36.0 h1:Xp+0bIOboP78qPGv9odh4Ird2LjsTldrztVRGsCkuxI=
 github.com/operator-framework/operator-registry v1.36.0/go.mod h1:+wioYPVlq1htVtpR5E1648A7ok1zh2Vn6E53ur3LnWs=
-github.com/operator-framework/rukpak v0.18.1 h1:yupmhELMfmkZLK+1IUERHFItBJ44a0nHrMudB/XTwyk=
-github.com/operator-framework/rukpak v0.18.1/go.mod h1:abntOB7EG2Ma9PQe2RLHhrmic2eGZAhnwP2zjDx/ghs=
 github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
 github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
 github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=

vendor/modules.txt

@@ -485,7 +485,7 @@ github.com/operator-framework/operator-registry/pkg/prettyunmarshaler
 github.com/operator-framework/operator-registry/pkg/registry
 github.com/operator-framework/operator-registry/pkg/sqlite
 github.com/operator-framework/operator-registry/pkg/sqlite/migrations
-# github.com/operator-framework/rukpak v0.18.1
+# github.com/operator-framework/rukpak v0.18.1 => github.com/openshift/operator-framework-rukpak v0.0.0-20240308020514-7589a1f04ea1
 ## explicit; go 1.21
 github.com/operator-framework/rukpak/api/v1alpha2
 # github.com/otiai10/copy v1.14.0
@@ -1267,4 +1267,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
 ## explicit; go 1.12
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
+# github.com/operator-framework/rukpak => github.com/openshift/operator-framework-rukpak v0.0.0-20240308020514-7589a1f04ea1
 # github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20240221182512-9666df2685f2