Skip to content

Commit

Permalink
[sc-80763]: updates from migration (#242)
Browse files Browse the repository at this point in the history
* [sc-80763]: updates from migration

Signed-off-by: Patrick Stephens <[email protected]>

* Fix Vivo container load

Signed-off-by: Patrick Stephens <[email protected]>

* Fix pulling

Signed-off-by: Patrick Stephens <[email protected]>

* Add debug

Signed-off-by: Patrick Stephens <[email protected]>

* Add ARM builds

Signed-off-by: Patrick Stephens <[email protected]>

* Wait for apply

Signed-off-by: Patrick Stephens <[email protected]>

* Wait for apply

Signed-off-by: Patrick Stephens <[email protected]>

* Remove local container

Signed-off-by: Patrick Stephens <[email protected]>

---------

Signed-off-by: Patrick Stephens <[email protected]>
  • Loading branch information
patrick-stephens authored Feb 26, 2024
1 parent 896da10 commit 3195bb5
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 31 deletions.
19 changes: 0 additions & 19 deletions .github/pull_request_template.md

This file was deleted.

18 changes: 10 additions & 8 deletions .github/workflows/ci-containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ on:
branches:
- master
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
- 'v*'
pull_request:
branches:
- master

jobs:
build-container-images:
build-container-images:
outputs:
digest: ${{ steps.outputs.outputs.digest }}
permissions:
Expand Down Expand Up @@ -89,14 +89,14 @@ jobs:
uses: actions/checkout@v4

- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.8.0
uses: helm/kind-action@v1.9.0
with:
cluster_name: kind
config: ./kind/config.yaml

- name: Apply local service using image from this run
run: |
sed -i 's|image: calyptia/vivo|image: ghcr.io/calyptia/vivo@${{ needs.build-container-images.outputs.digest }}|g' ./vivo-deployment.yaml
sed -i 's|image: calyptia/vivo|image: ghcr.io/chronosphereio/calyptia-vivo@${{ needs.build-container-images.outputs.digest }}|g' ./vivo-deployment.yaml
cat ./vivo-deployment.yaml
kubectl apply -f ./vivo-deployment.yaml
shell: bash
Expand All @@ -105,8 +105,8 @@ jobs:
timeout-minutes: 5
run: |
echo "Waiting for deployment to complete..."
until kubectl rollout status deployment calyptia-vivo; do
echo -n "."
until kubectl rollout status deployment calyptia-vivo --timeout=2s; do
kubectl describe deployment calyptia-vivo
sleep 2
done
echo
Expand All @@ -126,6 +126,7 @@ jobs:
run: |
kubectl cluster-info || true
kubectl get all || true
kubectl describe pod --selector=app.kubernetes.io/name=vivo || true
kubectl get events || true
kubectl get pods --all-namespaces -o wide --show-labels || true
kubectl logs "$(kubectl get pod --selector=app.kubernetes.io/name=vivo --output=jsonpath={.items..metadata.name})" || true
Expand Down Expand Up @@ -161,7 +162,7 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Get Docker tags
id: docker_meta
uses: docker/metadata-action@v5
Expand Down Expand Up @@ -192,7 +193,7 @@ jobs:
- name: Sign Container Image
continue-on-error: true
run: |
cosign sign --force --yes calyptia/vivo@${{ steps.docker_build.outputs.digest }}
cosign sign --recursive --yes calyptia/vivo@${{ steps.docker_build.outputs.digest }}
shell: bash

release-on-tag:
Expand All @@ -203,6 +204,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- name: Release on tag
uses: softprops/action-gh-release@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN \
find out -name '*.css' -print0 | xargs -0 sed "s@url(/@url($NEXT_PUBLIC_VIVO_BASE_PATH/@g" -i

#########
FROM golang:1.21 as service-builder
FROM golang:1.22 as service-builder

# Ensure we produce a static binary to prevent issues between this image and the production one
ARG TARGETOS TARGETARCH
Expand All @@ -43,7 +43,7 @@ COPY packages/service .
RUN go build -o vivo-service -trimpath -tags netgo,osusergo .

######## Fluent Bit
FROM fluent/fluent-bit:2.1.10 as production
FROM fluent/fluent-bit:2.2.2 as production
ARG vivo_base_path

### Set working directory
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Vivo

[Vivo](https://github.com/calyptia/vivo) provides a visualization interface for _logs_, _metrics,_ and _traces_.
[Vivo](https://github.com/chronosphereio/calyptia-vivo) provides a visualization interface for _logs_, _metrics,_ and _traces_.

![Calyptia Logo](./docs/hello_calyptia.png)

Expand Down
1 change: 0 additions & 1 deletion vivo-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ spec:
spec:
containers:
- image: calyptia/vivo
imagePullPolicy: Always
name: vivo
ports:
- name: forward
Expand Down

0 comments on commit 3195bb5

Please sign in to comment.