Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #172

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
merged 26 commits into from
Oct 17, 2024
+6 −8
Merged

NO-ISSUE: Synchronize From Upstream Repositories #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8e0efaa
Remove `EnableExtensionApi` feature gate (#1375)
m1kola Oct 16, 2024
8757c3a
Merge branch 'main' into synchronize
Oct 17, 2024
6b69533
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
80fa6d8
UPSTREAM: <carry>: Drop commitchecker
awgreene Nov 3, 2023
4557a0e
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Dec 16, 2023
d371a15
UPSTREAM: <carry>: update owners
Mar 27, 2024
a8a37e9
UPSTREAM: <carry>: Add pointer to tooling README
bentito Apr 1, 2024
817351a
UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
Apr 26, 2024
2b03a64
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Mar 27, 2024
865ed47
UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
Apr 30, 2024
6be2861
UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
liouk May 2, 2024
f4e33ed
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
May 25, 2024
655229b
UPSTREAM: <carry>: add everettraven to approvers+reviewers
everettraven Jun 24, 2024
c9dd4ed
UPSTREAM: <carry>: add openshift kustomize overlay
everettraven Jul 9, 2024
a997e66
UPSTREAM: <carry>: Add tmshort to approvers
tmshort Sep 11, 2024
b847a6d
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Sep 18, 2024
f42f9d2
UPSTREAM: <carry>: Properly copy and call kustomize
tmshort Sep 23, 2024
6b737d5
UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
joelanford Sep 20, 2024
d1eb635
UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be …
dtfranz Sep 26, 2024
58e0472
UPSTREAM: <carry>: Add downstream verify makefile target
dtfranz Sep 27, 2024
a541ad9
UPSTREAM: <carry>: openshift: template log verbosity to be managed by…
joelanford Sep 28, 2024
669d6e3
UPSTREAM: <carry>: Add global-pull-secret flag
Oct 8, 2024
953efd6
UPSTREAM: <drop>: go mod vendor
Oct 17, 2024
f232d22
UPSTREAM: <drop>: remove upstream GitHub configuration
Oct 17, 2024
6df8f5d
UPSTREAM: <drop>: configure the commit-checker
Oct 17, 2024
126306d
UPSTREAM: <drop>: rewrite go mod
Oct 17, 2024
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 commitchecker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
expectedMergeBase: b7674d8514065e3790f48a37c8af48695f44cbef
expectedMergeBase: 8e0efaa757200f136f533b0b05b27ebc10686575
upstreamBranch: main
upstreamOrg: operator-framework
upstreamRepo: operator-controller
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,4 +252,4 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241015104326-7b54785fa1cf
replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241016150055-953b8f848c9f
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,8 @@ github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11 h1:eTNDkNRNV5lZvUbVM9Nop0lBcljSnA8rZX6yQPZ0ZnU=
github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11/go.mod h1:EmVJt97N+pfWFsli/ipXTBZqSG5F5KGQhm3c3IsGq1o=
github.com/openshift/operator-framework-catalogd v0.0.0-20241015104326-7b54785fa1cf h1:wLiuvUyfugOqfTP2Y0p3V/s2dokqaD+nh4jekQ0UDEs=
github.com/openshift/operator-framework-catalogd v0.0.0-20241015104326-7b54785fa1cf/go.mod h1:FrFSCwRXr4aPslcXIv48dan5AdM37k/B9tK/RpdvZCU=
github.com/openshift/operator-framework-catalogd v0.0.0-20241016150055-953b8f848c9f h1:Sz/vgzXZVyH0tD/4qk88WWcn8suDYqEoccUedh+PMis=
github.com/openshift/operator-framework-catalogd v0.0.0-20241016150055-953b8f848c9f/go.mod h1:FrFSCwRXr4aPslcXIv48dan5AdM37k/B9tK/RpdvZCU=
github.com/operator-framework/api v0.27.0 h1:OrVaGKZJvbZo58HTv2guz7aURkhVKYhFqZ/6VpifiXI=
github.com/operator-framework/api v0.27.0/go.mod h1:lg2Xx+S8NQWGYlEOvFwQvH46E5EK5IrAIL7HWfAhciM=
github.com/operator-framework/helm-operator-plugins v0.5.0 h1:qph2OoECcI9mpuUBtOsWOMgvpx52mPTTSvzVxICsT04=
Expand Down
2 changes: 0 additions & 2 deletions internal/features/features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ const (
// Ex: SomeFeature featuregate.Feature = "SomeFeature"

ForceSemverUpgradeConstraints featuregate.Feature = "ForceSemverUpgradeConstraints"
EnableExtensionAPI featuregate.Feature = "EnableExtensionApi"
)

var operatorControllerFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
// Add new feature gate definitions
// Ex: SomeFeature: {...}

ForceSemverUpgradeConstraints: {Default: false, PreRelease: featuregate.Alpha},
EnableExtensionAPI: {Default: false, PreRelease: featuregate.Alpha},
}

var OperatorControllerFeatureGate featuregate.MutableFeatureGate = featuregate.NewFeatureGate()
Expand Down
4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ github.com/operator-framework/api/pkg/validation
github.com/operator-framework/api/pkg/validation/errors
github.com/operator-framework/api/pkg/validation/interfaces
github.com/operator-framework/api/pkg/validation/internal
# github.com/operator-framework/catalogd v0.32.0 => github.com/openshift/operator-framework-catalogd v0.0.0-20241015104326-7b54785fa1cf
# github.com/operator-framework/catalogd v0.32.0 => github.com/openshift/operator-framework-catalogd v0.0.0-20241016150055-953b8f848c9f
## explicit; go 1.22.5
github.com/operator-framework/catalogd/api/core/v1alpha1
# github.com/operator-framework/helm-operator-plugins v0.5.0
Expand Down Expand Up @@ -2103,4 +2103,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v2
sigs.k8s.io/yaml/goyaml.v3
# github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241015104326-7b54785fa1cf
# github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241016150055-953b8f848c9f