Skip to content

Commit b82812e

Browse files
committed
REMOVE extension api from main branch
1 parent 6d73b73 commit b82812e

17 files changed

+49
-1485
lines changed

Makefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ IMG := $(IMAGE_REPO):$(IMAGE_TAG)
2222
# Define dependency versions (use go.mod if we also use Go code from dependency)
2323
export CERT_MGR_VERSION := v1.9.0
2424
export CATALOGD_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/catalogd)
25-
export KAPP_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/vmware-tanzu/carvel-kapp-controller)
2625
export RUKPAK_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/rukpak)
2726
export WAIT_TIMEOUT := 60s
2827

@@ -166,7 +165,7 @@ kind-load: $(KIND) #EXHELP Loads the currently constructed image onto the cluste
166165
kind-deploy: export MANIFEST := ./operator-controller.yaml
167166
kind-deploy: manifests $(KUSTOMIZE) #EXHELP Install controller and dependencies onto the kind cluster.
168167
$(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) > operator-controller.yaml
169-
envsubst '$$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$KAPP_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh | bash -s
168+
envsubst '$$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh | bash -s
170169

171170
.PHONY: kind-cluster
172171
kind-cluster: $(KIND) #EXHELP Standup a kind cluster.
@@ -254,7 +253,7 @@ release: $(GORELEASER) #EXHELP Runs goreleaser for the operator-controller. By d
254253
quickstart: export MANIFEST := https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/operator-controller.yaml
255254
quickstart: $(KUSTOMIZE) manifests #EXHELP Generate the installation release manifests and scripts.
256255
$(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) | sed "s/:devel/:$(VERSION)/g" > operator-controller.yaml
257-
envsubst '$$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$KAPP_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh > install.sh
256+
envsubst '$$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh > install.sh
258257

259258
##@ Docs
260259

api/v1alpha1/clusterextension_types.go

+18
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ import (
2525
type UpgradeConstraintPolicy string
2626

2727
const (
28+
29+
// TypeProgressing indicates whether operator-controller is
30+
// reconciling, installing, updating or deleting an extension.
31+
TypeProgressing = "Progressing"
32+
33+
ReasonProgressing = "Progressing"
34+
ReasonFailedToReachDesiredIntent = "FailedToReachDesiredIntent"
35+
ReasonReachedDesiredIntent = "ReachedDesiredIntent"
36+
2837
// The extension will only upgrade if the new version satisfies
2938
// the upgrade constraints set by the package author.
3039
UpgradeConstraintPolicyEnforce UpgradeConstraintPolicy = "Enforce"
@@ -106,6 +115,7 @@ func init() {
106115
TypePackageDeprecated,
107116
TypeChannelDeprecated,
108117
TypeBundleDeprecated,
118+
TypeProgressing,
109119
)
110120
// TODO(user): add Reasons from above
111121
conditionsets.ConditionReasons = append(conditionsets.ConditionReasons,
@@ -118,9 +128,17 @@ func init() {
118128
ReasonInvalidSpec,
119129
ReasonSuccess,
120130
ReasonDeprecated,
131+
ReasonProgressing,
132+
ReasonFailedToReachDesiredIntent,
133+
ReasonReachedDesiredIntent,
121134
)
122135
}
123136

137+
type BundleMetadata struct {
138+
Name string `json:"name"`
139+
Version string `json:"version"`
140+
}
141+
124142
// ClusterExtensionStatus defines the observed state of ClusterExtension
125143
type ClusterExtensionStatus struct {
126144
// +optional

api/v1alpha1/extension_types.go

-159
This file was deleted.

api/v1alpha1/zz_generated.deepcopy.go

-142
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/manager/main.go

-8
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@ func main() {
108108
setupLog.Error(err, "unable to create controller", "controller", "ClusterExtension")
109109
os.Exit(1)
110110
}
111-
112-
if err = (&controllers.ExtensionReconciler{
113-
Client: cl,
114-
BundleProvider: catalogClient,
115-
}).SetupWithManager(mgr); err != nil {
116-
setupLog.Error(err, "unable to create controller", "controller", "Extension")
117-
os.Exit(1)
118-
}
119111
//+kubebuilder:scaffold:builder
120112

121113
if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {

0 commit comments

Comments
 (0)