Skip to content

Commit

Permalink
chore(docs): update doc/config.md to reflect 3.0 changes (#922)
Browse files Browse the repository at this point in the history
* update examples in config to v1beta2

* fix outdated links and info

* update info

* fix storage/database typo

* reviews

* make bundle update

(cherry picked from commit 56bfead)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
  • Loading branch information
mwangggg authored and mergify[bot] committed Aug 9, 2024
1 parent c17fe4c commit 7841e56
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 68 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ endif

.PHONY: undeploy
undeploy: ## Undeploy controller from the configured cluster in ~/.kube/config.
- $(CLUSTER_CLIENT) delete --ignore-not-found=$(ignore-not-found) -f config/samples/operator_v1beta1_cryostat.yaml
- $(CLUSTER_CLIENT) delete --ignore-not-found=$(ignore-not-found) -f config/samples/operator_v1beta2_cryostat.yaml
- $(KUSTOMIZE) build $(KUSTOMIZE_DIR) | $(CLUSTER_CLIENT) delete --ignore-not-found=$(ignore-not-found) -f -

.PHONY: deploy_bundle
Expand Down Expand Up @@ -550,4 +550,4 @@ create_cryostat_cr: destroy_cryostat_cr ## Create a namespaced Cryostat instance

.PHONY: destroy_cryostat_cr
destroy_cryostat_cr: ## Delete a namespaced Cryostat instance.
- $(CLUSTER_CLIENT) delete --ignore-not-found=$(ignore-not-found) -f config/samples/operator_v1beta1_cryostat.yaml
- $(CLUSTER_CLIENT) delete --ignore-not-found=$(ignore-not-found) -f config/samples/operator_v1beta2_cryostat.yaml
5 changes: 5 additions & 0 deletions bundle/manifests/cryostat-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,13 @@ metadata:
]
capabilities: Seamless Upgrades
categories: Monitoring, Developer Tools
<<<<<<< HEAD
containerImage: quay.io/cryostat/cryostat-operator:3.0.1-dev
createdAt: "2024-07-31T13:59:44Z"
=======
containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev
createdAt: "2024-08-07T21:05:35Z"
>>>>>>> 56bfead (chore(docs): update doc/config.md to reflect 3.0 changes (#922))
description: JVM monitoring and profiling tool
operatorframework.io/initialization-resource: |-
{
Expand Down
Loading

0 comments on commit 7841e56

Please sign in to comment.