Skip to content

Commit

Permalink
Merge pull request #96 from sustainable-computing-io/v003
Browse files Browse the repository at this point in the history
Improve capitalization consistency. Bump version.
  • Loading branch information
trent-s authored Apr 18, 2024
2 parents eaf0ba3 + 51c0798 commit c8a0863
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 22 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# VERSION defines the project version for the bundle.
# Update this value when you upgrade the version of your project.
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.3)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.3)
VERSION ?= $(shell cat VERSION)

# CHANNELS define the bundle channels used in the bundle.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Energy of the group of pods is exposed in 2 ways:
| Environmental Variable | Default Value | Description |
|:---------------------------:|:-----------------------------:|:------------------------------------------------:|
| SUSQL_NAMESPACE | openshift-kepler-operator | namespace that SUSQL resources run in |
| SUSQL_NAMESPACE | openshift-kepler-operator | namespace that SusQL resources run in |
| KEPLER_PROMETHEUS_NAMESPACE | openshift-monitoring | namespace that Kepler Prometheus runs in |
| PROMETHEUS_PROTOCOL | http | Either http or https for Kepler Prometheus access|
| PROMETHEUS_SERVICE | prometheus-k8s | service name for the Kepler Prometheus |
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.2
0.0.3
20 changes: 12 additions & 8 deletions bundle/manifests/susql-operator.clusterserviceversion.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/sustainable_computing_io/susql_operator
newTag: 0.0.2
newTag: 0.0.3
16 changes: 10 additions & 6 deletions config/manifests/bases/susql-operator.clusterserviceversion.yaml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions deployment/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ do

elif [[ ${action} = "prometheus-deploy" ]]; then
# Install prometheus from community helm charts
echo "->Deploying Prometheus controller to store susql data..."
echo "->Deploying Prometheus controller to store SusQL data..."

helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
helm repo update
Expand Down Expand Up @@ -249,14 +249,14 @@ do
# Check if the error message contains "not found"
if [[ "$error_message" == *"not found"* ]]; then
# Custom message if release not found
echo "Susql Controller not found"
echo "SusQL Controller not found"
else
# Display the original error message
echo "$error_message"
fi
else
# Success message if the command was successful
echo "Susql uninstall successful."
echo "SusQL uninstall successful."
helm -n ${SUSQL_NAMESPACE} uninstall susql-controller
fi
fi
Expand Down

0 comments on commit c8a0863

Please sign in to comment.