Skip to content

Commit

Permalink
Removing the UI code, the new repository is opencost/opencost-ui (#2741)
Browse files Browse the repository at this point in the history
* Removing the UI code, the new repository is https://github.com/opencost/opencost-ui

Do not merge until we have working packages from that repository.

Signed-off-by: Matt Ray <github@mattray.dev>

* Removed UI settings

Signed-off-by: Matt Ray <github@mattray.dev>

* Updated for 1.110.0 and UI moving

Signed-off-by: Matt Ray <github@mattray.dev>

* Updated where to find versions and where to open UI issues

Signed-off-by: Matt Ray <github@mattray.dev>

* Remove UI-related testing and release code

Signed-off-by: Matt Ray <github@mattray.dev>

---------

Signed-off-by: Matt Ray <github@mattray.dev>
  • Loading branch information
mattray committed May 15, 2024
1 parent c362759 commit c87b36f
Show file tree
Hide file tree
Showing 59 changed files with 6 additions and 10,339 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/opencost-bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assignees: ''
---

**Describe the bug**
A clear and concise description of what the OpenCost bug is. Please ensure this is an issue related to the OpenCost cost model, API, UI or specification. Public Kubecost bugs may be opened at https://github.com/kubecost/features-bugs
A clear and concise description of what the OpenCost bug is. Please ensure this is an issue related to the OpenCost cost model, API or specification. UI issues may be opened in the [OpenCost UI repository](https://github.com/opencost/opencost-ui).

**To Reproduce**
Steps to reproduce the behavior:
Expand All @@ -24,7 +24,7 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Which version of OpenCost are you using?**
This may be the Kubecost release.
You can find the version from the container's startup logging or from the bottom of the page in the UI.

**Additional context**
Add any other context about the problem here. Kubernetes versions and which public clouds you are working with are especially important.
6 changes: 0 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,3 @@ updates:
directory: "/"
schedule:
interval: "weekly"

# Dependencies listed in ui/package.json
- package-ecosystem: "npm"
directory: "/ui"
schedule:
interval: "weekly"
16 changes: 0 additions & 16 deletions .github/workflows/build-and-publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,9 @@ jobs:
echo "IMAGE_TAG=ghcr.io/opencost/opencost:${{ steps.sha.outputs.OC_SHORTHASH }}" >> $GITHUB_OUTPUT
echo "IMAGE_TAG_LATEST=ghcr.io/opencost/opencost:latest" >> $GITHUB_OUTPUT
echo "IMAGE_TAG_VERSION=ghcr.io/opencost/opencost:${{ steps.version_number.outputs.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
echo "IMAGE_TAG_UI=ghcr.io/opencost/opencost-ui:${{ steps.sha.outputs.OC_SHORTHASH }}" >> $GITHUB_OUTPUT
echo "IMAGE_TAG_UI_LATEST=ghcr.io/opencost/opencost-ui:latest" >> $GITHUB_OUTPUT
echo "IMAGE_TAG_UI_VERSION=ghcr.io/opencost/opencost-ui:${{ steps.version_number.outputs.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
# echo "IMAGE_TAG_QUAY=quay.io/kubecost1/kubecost-cost-model:${{ steps.sha.outputs.OC_SHORTHASH }}" >> $GITHUB_OUTPUT
# echo "IMAGE_TAG_LATEST_QUAY=quay.io/kubecost1/kubecost-cost-model:latest" >> $GITHUB_OUTPUT
# echo "IMAGE_TAG_VERSION_QUAY=quay.io/kubecost1/kubecost-cost-model:prod-${{ steps.version_number.outputs.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
# echo "IMAGE_TAG_UI_QUAY=quay.io/kubecost1/opencost-ui:${{ steps.sha.outputs.OC_SHORTHASH }}" >> $GITHUB_OUTPUT
# echo "IMAGE_TAG_UI_LATEST_QUAY=quay.io/kubecost1/opencost-ui:latest" >> $GITHUB_OUTPUT
# echo "IMAGE_TAG_UI_VERSION_QUAY=quay.io/kubecost1/opencost-ui:prod-${{ inputs.release_version }}" >> $GITHUB_OUTPUT

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down Expand Up @@ -141,13 +135,3 @@ jobs:
# crane copy '${{ steps.tags.outputs.IMAGE_TAG }}' '${steps.tags.outputs.IMAGE_TAG_QUAY}'
# crane copy '${{ steps.tags.outputs.IMAGE_TAG }}' '${steps.tags.outputs.IMAGE_TAG_LATEST_QUAY}'
# crane copy '${{ steps.tags.outputs.IMAGE_TAG }}' '${steps.tags.outputs.IMAGE_TAG_VERSION_QUAY}'

- name: Build and push (multiarch) OpenCost UI
working-directory: ./opencost/ui
run: |
just build '${{ steps.tags.outputs.IMAGE_TAG_UI }}' '${{ steps.version_number.outputs.RELEASE_VERSION }}'
crane copy '${{ steps.tags.outputs.IMAGE_TAG_UI }}' '${{ steps.tags.outputs.IMAGE_TAG_UI_LATEST }}'
crane copy '${{ steps.tags.outputs.IMAGE_TAG_UI }}' '${{ steps.tags.outputs.IMAGE_TAG_UI_VERSION }}'
# crane copy '${steps.tags.outputs.IMAGE_TAG_UI}' '${steps.tags.outputs.IMAGE_TAG_UI_QUAY}'
# crane copy '${steps.tags.outputs.IMAGE_TAG_UI}' '${steps.tags.outputs.IMAGE_TAG_UI_LATEST_QUAY}'
# crane copy '${steps.tags.outputs.IMAGE_TAG_UI}' '${steps.tags.outputs.IMAGE_TAG_UI_VERSION_QUAY}'
38 changes: 1 addition & 37 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/setup-go@v5
with:
go-version: 'stable'

-
name: Install protoc
uses: arduino/setup-protoc@v3
Expand Down Expand Up @@ -93,39 +93,3 @@ jobs:
pr_num.txt
base.txt
head.txt
frontend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
path: ./

-
name: Install just
uses: extractions/setup-just@v1

-
name: Install node
uses: actions/setup-node@v4
with:
node-version: '18.3.0'

- name: Get npm cache directory
id: npm-cache-dir
shell: bash
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}

- uses: actions/cache@v4
id: npm-cache # use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true'
with:
path: ${{ steps.npm-cache-dir.outputs.dir }}
key: ${{ runner.os }}-node-${{ hashFiles('./ui/**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
-
name: Build
working-directory: ./ui
run: |
just build-local
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
.idea
*.iml

ui/.parcel-cache
ui/.cache
ui/dist
ui/.env
ui/node_modules/
cmd/costmodel/costmodel
cmd/costmodel/costmodel-amd64
cmd/costmodel/costmodel-arm64
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ OpenCost give teams visibility into current and historical Kubernetes and cloud
These models provide cost transparency in Kubernetes environments that support multiple applications, teams, departments, etc.
It also provides visibility into the cloud costs across multiple providers.

OpenCost was originally developed and open sourced by [Kubecost](https://kubecost.com). This project combines a [specification](/spec/) as well as a Golang implementation of these detailed requirements.
OpenCost was originally developed and open sourced by [Kubecost](https://kubecost.com). This project combines a [specification](/spec/) as well as a Golang implementation of these detailed requirements. The web UI is available in the [opencost/opencost-ui](http://github.com/opencost/opencost-ui) repository.

[![OpenCost UI Walkthrough](./ui/src/thumbnail.png)](https://youtu.be/lCP4Ci9Kcdg)
*OpenCost UI Walkthrough*
Expand All @@ -22,6 +22,8 @@ To see the full functionality of OpenCost you can view [OpenCost features](https
- Supports on-prem k8s clusters with custom CSV pricing
- Allocation for in-cluster K8s resources like CPU, GPU, memory, and persistent volumes
- Easily export pricing data to Prometheus with /metrics endpoint ([learn more](https://www.opencost.io/docs/installation/prometheus))
- Carbon costs for cloud resources
- Support for external costs like Datadog through [OpenCost Plugins](https://github.com/opencost/opencost-plugins)
- Free and open source distribution ([Apache2 license](LICENSE))

## Getting Started
Expand Down
3 changes: 0 additions & 3 deletions ui/.babelrc

This file was deleted.

2 changes: 0 additions & 2 deletions ui/.dockerignore

This file was deleted.

1 change: 0 additions & 1 deletion ui/.nvmrc

This file was deleted.

48 changes: 0 additions & 48 deletions ui/Dockerfile

This file was deleted.

38 changes: 0 additions & 38 deletions ui/Dockerfile.cross

This file was deleted.

40 changes: 0 additions & 40 deletions ui/Dockerfile.debug

This file was deleted.

65 changes: 0 additions & 65 deletions ui/README.md

This file was deleted.

0 comments on commit c87b36f

Please sign in to comment.