Skip to content

Commit

Permalink
Merge pull request #92 from kloudlite/release-v1.0.2
Browse files Browse the repository at this point in the history
Release v1.0.2
  • Loading branch information
nxtcoder17 authored Feb 19, 2024
2 parents dfe9486 + 28e114f commit 15b7a0f
Show file tree
Hide file tree
Showing 104 changed files with 4,140 additions and 2,903 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/build-container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ jobs:
echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
echo "OVERRIDE_PUSHED_IMAGE=false" >> $GITHUB_ENV
- name: Build
if: "!startsWith(github.ref, 'refs/heads/release-') && !startsWith(github.ref, 'refs/tags/')"
run: |
image_name="ghcr.io/${{ github.repository }}/${{matrix.app}}"
docker build --build-arg APP=${{matrix.app}} -f ${{matrix.dockerFile}} . -t "$image_name:test"
- name: Build & Push Image
if: startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/')
run: |
Expand All @@ -92,12 +98,3 @@ jobs:
docker build --build-arg APP=${{matrix.app}} -f ${{matrix.dockerFile}} . -t "$image_name:$IMAGE_TAG" --push
# - name: Build & Push Image
# if: startsWith(github.ref, 'refs/heads/release')
# run: |
# branch_name=${GITHUB_REF#refs/heads/}
# version_string="v${branch_name#release-}-nightly"
#
# docker build --build-arg APP=${{matrix.app}} -f ${{matrix.dockerFile}} . -t ghcr.io/kloudlite/web/${{matrix.app}}:$version_string --push
# docker build --build-arg APP=${{matrix.app}} -f ${{matrix.dockerFile}} . -t ghcr.io/kloudlite/web/${{matrix.app}}:commit-${GITHUB_SHA} --push
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public/**

out
.firebase
.firebaseConfig.js

storybook-dist

Expand Down
11 changes: 11 additions & 0 deletions gql-queries-generator/doc/queries.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ query consoleGetProviderSecret($name: String!) {

query consoleGetNodePool($clusterName: String!, $poolName: String!) {
infra_getNodePool(clusterName: $clusterName, poolName: $poolName) {
id
clusterName
createdBy {
userEmail
Expand Down Expand Up @@ -657,6 +658,7 @@ query consoleListNodePools($clusterName: String!, $search: SearchNodepool, $pagi
edges {
cursor
node {
id
clusterName
createdBy {
userEmail
Expand Down Expand Up @@ -894,6 +896,10 @@ mutation consoleCloneEnvironment($projectName: String!, $sourceEnvName: String!,
}
}

query consoleRestartApp($projectName: String!, $envName: String!, $appName: String!) {
core_restartApp(projectName: $projectName, envName: $envName, appName: $appName)
}

mutation consoleCreateApp($projectName: String!, $envName: String!, $app: AppIn!) {
core_createApp(projectName: $projectName, envName: $envName, app: $app) {
id
Expand Down Expand Up @@ -2691,6 +2697,10 @@ query consoleListPvs($clusterName: String!, $search: SearchPersistentVolumes, $p
}
}

mutation consoleDeletePV($clusterName: String!, $pvName: String!) {
infra_deletePV(clusterName: $clusterName, pvName: $pvName)
}

query consoleListBuildRuns($repoName: String!, $search: SearchBuildRuns, $pq: CursorPaginationIn) {
cr_listBuildRuns(repoName: $repoName, search: $search, pq: $pq) {
edges {
Expand Down Expand Up @@ -3786,6 +3796,7 @@ query authCli_getDevice($name: String!) {
}
clusterName
projectName
environmentName
spec {
activeNamespace
disabled
Expand Down
10 changes: 8 additions & 2 deletions lib/app-setup/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { TopBar } from '~/components/organisms/top-bar';
import styleZenerSelect from '@oshq/react-select/index.css';
import stylesUrl from '~/design-system/index.css';
import rcss from 'react-highlightjs-logs/dist/index.css';
import tailwindBase from '~/design-system/tailwind-base.js';
import { isDev } from '../client/helpers/log';
import { getClientEnv, getServerEnv } from '../configs/base-url.cjs';

Expand Down Expand Up @@ -171,15 +172,20 @@ const Root = ({
<div
id="loadOverlay"
style={{
backgroundColor: '#777',
backgroundColor: tailwindBase.theme.colors.surface.basic.default,
position: 'absolute',
top: '0px',
left: '0px',
width: '100vw',
height: '100vh',
zIndex: '2000',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
}}
/>
>
Loading...
</div>

{/* <Loading progress={transition} /> */}
<script
Expand Down
12 changes: 12 additions & 0 deletions lib/client/components/logger/dummy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export const logsMockData = [
'nnQhCA0QTSuukrRA',
'0dlRACNaaPWkx3hBmZNksKoR',
'9BLDLfyAHeCTjoUgLshkJ9eWpqfUkLEf',
'TaJLEEhzWZvd6wt74fWe9oH9G7rhuzRO0ZZDFH49',
'o2Znr1VqxwlnFcyOe8S78z1HXrwIUcrnGdpXoEj2smsD6d',
'5EIOShSO5vqfRojDxuRzdr0S5ILjQ65TuMEm7o6Q75maqJqKCnAj9L',
'wfS7vAAvVY5BGhku2HE9Xnc7tF8wjH913u0i0f2JbOvXuvibfsFtbYnzC9ghk',
'eBfcNEUnIcTDceQGc3jAoZdOno977hMQ5Hfd8LNrrnm9ZVnZpQyMl5Hf3FbTqthhIMdvzs',
'jInteYIHeEBT7ZMKnNUbACPPs7YAUdnzegotEOzWkexdT1reZbzASBkb0LCx4k048gj2kUznyRvea45',
'SQpMBRSCEvC2EWIq2eQ21ljhQkx7hi3t9WNgMpLI0vuaeaUTTcIDXYPqorSJUiGmvQ9R1uQ0x9O0z0fVCNvGYehoaAEYp',
];
Loading

0 comments on commit 15b7a0f

Please sign in to comment.