Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat : custom repositories #2248

Open
wants to merge 91 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
61cb972
added configs
jokestax Jul 18, 2024
fe2ec2f
removed local dependency
jokestax Jul 18, 2024
60a1b77
feat: resolved dependencies
jokestax Jul 23, 2024
b48baa4
fix: added fix for destroy command
jokestax Jul 23, 2024
6439bbd
rebased
jokestax Jul 18, 2024
0b722a5
removed local dependency
jokestax Jul 18, 2024
af871c1
feat: resolved dependencies
jokestax Jul 23, 2024
c9baeb2
fix: added fix for destroy command
jokestax Jul 23, 2024
6cfed16
rebased
jokestax Jul 23, 2024
613c833
Merge branch 'feat-custom-repo' of https://github.com/kubefirst/kubef…
jokestax Jul 23, 2024
60b14dd
rebased
jokestax Jul 23, 2024
99c5fdc
custom repo for k3d
jokestax Jul 24, 2024
7388ecf
changed repo names
jokestax Jul 26, 2024
e170bc8
fix for google cloud
jokestax Jul 27, 2024
d9c5c8b
Merge branch 'main' into feat-custom-repo
fharper Jul 29, 2024
01f4dfe
fix for k3d
jokestax Jul 30, 2024
f7b5347
Update go.mod
jokestax Jul 30, 2024
74573bb
Merge branch 'main' into feat-custom-repo
fharper Jul 30, 2024
8b519fd
Merge branch 'main' into feat-custom-repo
fharper Jul 31, 2024
d301204
resolved the suggestions
Aug 1, 2024
6fa2d22
Merge branch 'main' into feat-custom-repo
jokestax Aug 28, 2024
5d5c226
set next macro chart for kubefirst - 2.5.0-rc9
konstruct-bot Aug 28, 2024
d9b0941
set next macro chart for kubefirst - 2.5.0-rc10
konstruct-bot Aug 28, 2024
d0d4da2
set next macro chart for kubefirst - 2.5.0-rc11
konstruct-bot Aug 28, 2024
0b6f2af
set next macro chart for kubefirst - 2.5.0-rc12
konstruct-bot Aug 28, 2024
89dfad5
set next macro chart for kubefirst - 2.5.0-rc13
konstruct-bot Aug 28, 2024
2d7b8f2
reference to konstruct
jokestax Aug 28, 2024
be671de
Merge pull request #2267 from konstructio/reference-konstruct
jokestax Aug 28, 2024
2500c7a
add restart function for argo
jokestax Aug 28, 2024
19c0475
set next macro chart for kubefirst - 2.5.0-rc14
konstruct-bot Aug 28, 2024
25e0aaa
set next macro chart for kubefirst - 2.5.0-rc15
konstruct-bot Aug 28, 2024
d0747ae
set next macro chart for kubefirst - 2.5.0-rc16
konstruct-bot Aug 28, 2024
456c15e
set next macro chart for kubefirst - 2.5.0-rc17
konstruct-bot Aug 28, 2024
703dc80
refer latest kubefirst-api
jokestax Aug 28, 2024
f178edd
set next macro chart for kubefirst - 2.5.0-rc18
konstruct-bot Aug 28, 2024
a94c1a6
set next macro chart for kubefirst - 2.5.0-rc19
konstruct-bot Aug 28, 2024
44ad122
set next macro chart for kubefirst - 2.5.0-rc20
konstruct-bot Aug 28, 2024
b52ccde
Add conditions based on the situation.
patrickdappollonio Aug 28, 2024
2c950b4
Fix linting messages.
patrickdappollonio Aug 28, 2024
a30001b
set next macro chart for kubefirst - 2.5.0
konstruct-bot Aug 28, 2024
58cb316
removed duplicate
jokestax Aug 28, 2024
f9b8363
Merge pull request #2269 from konstructio/restart-argo
jokestax Aug 28, 2024
6a7998e
replace kubefirst refs with konstructio (#2270)
jarededwards Aug 28, 2024
1060f5a
use generated release notes for gitops-template (#2271)
jarededwards Aug 28, 2024
98a3aaa
set next macro chart for kubefirst - 2.5.1
konstruct-bot Aug 29, 2024
733da32
set next macro chart for kubefirst - 2.5.3-rc1
konstruct-bot Aug 29, 2024
946826c
set next macro chart for kubefirst - 2.5.3-rc2
konstruct-bot Aug 29, 2024
0b51b2e
set next macro chart for kubefirst - 2.5.3-rc3
konstruct-bot Aug 29, 2024
d718ebb
set next macro chart for kubefirst - 2.5.3-rc4
konstruct-bot Aug 29, 2024
f74dbae
set next macro chart for kubefirst - 2.5.3
konstruct-bot Aug 29, 2024
e56ded0
fix bad chart ref from kubefirst and emails (#2274)
jarededwards Aug 29, 2024
e41a908
set next macro chart for kubefirst - 2.5.4-rc1
konstruct-bot Aug 29, 2024
be4722f
set next macro chart for kubefirst - 2.5.4-rc2
konstruct-bot Aug 29, 2024
039bfa7
set next macro chart for kubefirst - 2.5.4
konstruct-bot Aug 29, 2024
515cac2
set next macro chart for kubefirst - 2.5.5-rc1
konstruct-bot Aug 29, 2024
4a89610
set next macro chart for kubefirst - 2.5.5-rc2
konstruct-bot Aug 29, 2024
8513884
set next macro chart for kubefirst - 2.5.5-rc3
konstruct-bot Aug 29, 2024
a2ce795
remove v so regex matches again (#2275)
jarededwards Aug 30, 2024
475790d
set next macro chart for kubefirst - 2.5.8-rc1
konstruct-bot Aug 30, 2024
26b8021
set next macro chart for kubefirst - 2.5.8
konstruct-bot Aug 30, 2024
15e4b8d
set next macro chart for kubefirst - 2.5.9-rc1
konstruct-bot Aug 30, 2024
51153a9
set next macro chart for kubefirst - 2.5.9-rc2
konstruct-bot Aug 30, 2024
8996335
set next macro chart for kubefirst - 2.5.9-rc3
konstruct-bot Aug 30, 2024
5c8f9b6
set next macro chart for kubefirst - 2.5.9
konstruct-bot Aug 30, 2024
ebd23e0
set next macro chart for kubefirst - 2.5.10-rc1
konstruct-bot Aug 30, 2024
8557f55
set next macro chart for kubefirst - 2.5.10-rc2
konstruct-bot Aug 30, 2024
c57395c
set next macro chart for kubefirst - 2.5.10-rc3
konstruct-bot Aug 30, 2024
b7f5ecb
set next macro chart for kubefirst - 2.5.10
konstruct-bot Aug 30, 2024
d0e2ce6
set next macro chart for kubefirst - 0.1.0-rc131
konstruct-bot Aug 30, 2024
4354f64
set next macro chart for kubefirst - 2.5.11-rc1
konstruct-bot Aug 31, 2024
6f754b7
set next macro chart for kubefirst - 2.5.11-rc2
konstruct-bot Aug 31, 2024
7ce2ae5
set next macro chart for kubefirst - 2.5.11-rc3
konstruct-bot Aug 31, 2024
0e3eada
set next macro chart for kubefirst - 2.5.11
konstruct-bot Aug 31, 2024
5d71fa1
fix: devel (#2276)
CristhianF7 Sep 1, 2024
f535958
rebased
jokestax Jul 18, 2024
cdcb7e6
removed local dependency
jokestax Jul 18, 2024
ce4fb5b
feat: resolved dependencies
jokestax Jul 23, 2024
5d59d7e
fix: added fix for destroy command
jokestax Jul 23, 2024
f1affd9
rebased
jokestax Jul 23, 2024
753c06d
added configs
jokestax Jul 18, 2024
625cc2d
removed local dependency
jokestax Jul 18, 2024
3659751
feat: resolved dependencies
jokestax Jul 23, 2024
b92a2f3
fix: added fix for destroy command
jokestax Jul 23, 2024
cf603c7
custom repo for k3d
jokestax Jul 24, 2024
6bfff97
changed repo names
jokestax Jul 26, 2024
6598736
fix for google cloud
jokestax Jul 27, 2024
ddd5156
fix for k3d
jokestax Jul 30, 2024
5cce6dd
Update go.mod
jokestax Jul 30, 2024
83b3118
resolved the suggestions
Aug 1, 2024
7def846
rebase
jokestax Sep 3, 2024
1e5f985
rebase
jokestax Sep 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bugs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ body:
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/kubefirst/kubefirst/blob/main/CODE_OF_CONDUCT.md)
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/konstructio/kubefirst/blob/main/CODE_OF_CONDUCT.md)
options:
- label: I agree to follow this project's Code of Conduct
required: true
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Documentations
url: https://github.com/kubefirst/docs/issues/new?assignees=&labels=docs&template=docs.yml&title=%5BDocs%5D%3A+
url: https://github.com/konstructio/kubefirst-docs/issues/new?assignees=&labels=docs&template=docs.yml&title=%5BDocs%5D%3A+
about: Any suggestions related to the documentation, whether it's an issue, missing information, unclear steps or new page that should be created
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ body:
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/kubefirst/kubefirst/blob/main/CODE_OF_CONDUCT.md)
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/konstructio/kubefirst/blob/main/CODE_OF_CONDUCT.md)
options:
- label: I agree to follow this project's Code of Conduct
required: true
35 changes: 2 additions & 33 deletions .github/workflows/releaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
uses: actions/checkout@v2
- name: Update version file
run: echo $GITHUB_REF_NAME > VERSION.md
- name: Release kubefirst/gitops-template
run: gh release create -R kubefirst/gitops-template ${{ github.REF_NAME }} --notes "${{ env.RELEASE_NOTES }}"
- name: Release konstructio/gitops-template
run: gh release create -R konstructio/gitops-template ${{ github.REF_NAME }} --generate-notes
goreleaser:
runs-on: ubuntu-latest
steps:
Expand All @@ -41,34 +41,3 @@ jobs:
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

release-docker:
needs: goreleaser
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v3
with:
push: true
context: ./build
build-args: KUBEFIRST_VERSION=${{ github.REF_NAME }}
file: ./build/Dockerfile
tags: kubefirst/kubefirst:${{ github.REF_NAME }},kubefirst/kubefirst:latest
- name: Update Docker Hub Description
uses: peter-evans/dockerhub-description@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
repository: kubefirst/kubefirst
short-description: ${{ github.event.repository.description }}
8 changes: 4 additions & 4 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ builds:
flags:
- -trimpath
ldflags:
- -X github.com/kubefirst/kubefirst-api/configs.K1Version=v{{.Version}}
- -X github.com/konstructio/kubefirst-api/configs.K1Version=v{{.Version}}

#archives:
# - replacements:
Expand All @@ -35,10 +35,10 @@ changelog:
- '^test:'
brews:
- name: kubefirst
homepage: https://github.com/kubefirst/kubefirst
homepage: https://github.com/konstructio/kubefirst
repository:
owner: kubefirst
name: homebrew-tools
owner: konstructio
name: homebrew-taps
dependencies:
- aws-iam-authenticator
version: 2
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This Code of Conduct applies within all community spaces, and also applies when

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [conduct@kubefirst.com](mailto:conduct@kubefirst.com). All complaints will be reviewed and investigated promptly and fairly.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [conduct@konstruct.io](mailto:conduct@konstruct.io). All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the reporter of any incident.

Expand Down
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ Note we have a [code of conduct](CODE_OF_CONDUCT.md) which needs to be followed

At Kubefirst, we believe that every contribution is valuable, not just the code one, which means we welcome

- [bug reports](https://github.com/kubefirst/kubefirst/issues/new);
- [feature requests](https://github.com/kubefirst/kubefirst/issues/new?assignees=&labels=feature-request&template=feature_request.md&title=);
- [documentations issues reports](https://github.com/kubefirst/kubefirst/issues/new?assignees=&labels=feature-request&template=feature_request.md&title=) like unclear section, missing information or even typos;
- [bug reports](https://github.com/konstructio/kubefirst/issues/new);
- [feature requests](https://github.com/konstructio/kubefirst/issues/new?assignees=&labels=feature-request&template=feature_request.md&title=);
- [documentations issues reports](https://github.com/konstructio/kubefirst/issues/new?assignees=&labels=feature-request&template=feature_request.md&title=) like unclear section, missing information or even typos;
- and, of course, any code contributions to Kubefirst, or the documentations.

Before making a code change, first discuss your idea via an [issue](https://github.com/kubefirst/kubefirst/issues/new/choose). Please check if a feature request or bug report does [already exist](https://github.com/kubefirst/kubefirst/issues/) before creating a new one.
Before making a code change, first discuss your idea via an [issue](https://github.com/konstructio/kubefirst/issues/new/choose). Please check if a feature request or bug report does [already exist](https://github.com/konstructio/kubefirst/issues/) before creating a new one.

## Getting Started with the Code

Expand All @@ -35,31 +35,31 @@ If you want to create a [Civo cluster](https://docs.kubefirst.io/kubefirst/local

#### GitOps Template

Note that even if you run kubefirst from `main`, the [gitops-template](https://github.com/kubefirst/gitops-template) version used will be the [latest release](https://github.com/kubefirst/gitops-template/releases). If you also want to use the latest from `main` for the template, you need to run to use the `--gitops-template-url`, and the `--gitops-template-branch` as follow:
Note that even if you run kubefirst from `main`, the [gitops-template](https://github.com/konstructio/gitops-template) version used will be the [latest release](https://github.com/konstructio/gitops-template/releases). If you also want to use the latest from `main` for the template, you need to run to use the `--gitops-template-url`, and the `--gitops-template-branch` as follow:

```shell
go run . civo create --gitops-template-url https://github.com/kubefirst/gitops-template --gitops-template-branch main
go run . civo create --gitops-template-url https://github.com/konstructio/gitops-template --gitops-template-branch main
```

#### Kubefirst API

If you need to use a specific branch or latest from `main` that wasn't released yet for the [kubefirst-api](https://github.com/kubefirst/kubefirst-api) repository, you will need to first run it locally as described in [its documentation](https://github.com/kubefirst/kubefirst-api#running-locally). You will also need to run the code from [console](https://github.com/kubefirst/console) repository, whether you need to use a specific version of the code or not, as we don't expose the API directly. To do so, follow the [instructions in its README](https://github.com/kubefirst/console#setup-instructions). Before running the CLI as mentionned "The CLI" section, you need to export a local variable:
If you need to use a specific branch or latest from `main` that wasn't released yet for the [kubefirst-api](https://github.com/konstructio/kubefirst-api) repository, you will need to first run it locally as described in [its documentation](https://github.com/konstructio/kubefirst-api#running-locally). You will also need to run the code from [console](https://github.com/konstructio/console) repository, whether you need to use a specific version of the code or not, as we don't expose the API directly. To do so, follow the [instructions in its README](https://github.com/konstructio/console#setup-instructions). Before running the CLI as mentionned "The CLI" section, you need to export a local variable:

```shell
export K1_CONSOLE_REMOTE_URL="http://localhost:3000"
```

The previous steps will work for all clouds except k3d which use our runtime for now: we have plan to remove this dependencies completely and use the API also to make the code easier to maintain, and less prone to issues. For that step, instead of running the API, and console locally, you simply need to clone the [kubefirst-api](https://github.com/kubefirst/kubefirst-api) repository locally, and add the following line in the `go.mod` file:
The previous steps will work for all clouds except k3d which use our runtime for now: we have plan to remove this dependencies completely and use the API also to make the code easier to maintain, and less prone to issues. For that step, instead of running the API, and console locally, you simply need to clone the [kubefirst-api](https://github.com/konstructio/kubefirst-api) repository locally, and add the following line in the `go.mod` file:

```go
github.com/kubefirst/kubefirst-api vX.X.XX => /path-to/kubefirst-api/
github.com/konstructio/kubefirst-api vX.X.XX => /path-to/kubefirst-api/
```

Replace `vX.X.XX` with the latest version used in the mode file for the API, and the `/path-to/kubefirst-api/` with the path to the folder of your locally Kubefirst API folder.

## Getting Started with the Documentation

Please check the [CONTRIBUTING.md](https://github.com/kubefirst/docs/blob/main/CONTRIBUTING.md) file from the [docs](https://github.com/kubefirst/docs/) repository.
Please check the [CONTRIBUTING.md](https://github.com/konstructio/kubefirst-docs/blob/main/CONTRIBUTING.md) file from the [docs](https://github.com/konstructio/kubefirst-docs/) repository.

## Help

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</p>

<p align="center">
<a href="https://github.com/kubefirst/kubefirst/releases"><img title="Release" src="https://img.shields.io/github/v/release/kubefirst/kubefirst"/></a>
<a href="https://github.com/konstructio/kubefirst/releases"><img title="Release" src="https://img.shields.io/github/v/release/kubefirst/kubefirst"/></a>
<!-- <a href=""><img title="Docker builds" src="https://img.shields.io/docker/automated/kubeshop/tracetest"/></a> -->
<a href="https://github.com/kubefirst/kubefirst/releases"><img title="Release date" src="https://img.shields.io/github/release-date/kubefirst/kubefirst"/></a>
<a href="https://github.com/konstructio/kubefirst/releases"><img title="Release date" src="https://img.shields.io/github/release-date/kubefirst/kubefirst"/></a>
</p>

---
Expand Down Expand Up @@ -57,7 +57,7 @@ Feed K-Ray a GitHub star ⭐ above to bookmark our project and keep K-Ray happy!

## Contributions

We want to thank all of our contributors who created a pull request to fix a bug, add a new feature or update the [documentation](https://github.com/kubefirst/docs/). We also value a lot contributions in the form of bug reporting or feature requests: it helps us continuously make kubefirst better. Lastly, helping the users in our Slack community, or helping us share the love on social media are also ways in which you support us tremendously. We know your time is valuable, and we can't thank you enough for everything you do: we wouldn't be where we are without you!
We want to thank all of our contributors who created a pull request to fix a bug, add a new feature or update the [documentation](https://github.com/konstructio/kubefirst-docs/). We also value a lot contributions in the form of bug reporting or feature requests: it helps us continuously make kubefirst better. Lastly, helping the users in our Slack community, or helping us share the love on social media are also ways in which you support us tremendously. We know your time is valuable, and we can't thank you enough for everything you do: we wouldn't be where we are without you!

A special thanks to [DrummyFloyd](https://github.com/DrummyFloyd) who, in addition to adding support for k3s, is a champion all around within our community and the kubefirst project 🫶

Expand Down
2 changes: 1 addition & 1 deletion SUPPORT.MD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Issues

If you are having an issue with kubefirst, we highly suggest that you share the problem with us on our Slack Community (read the next section for more information). If you are certain it's a bug with our platform, you can create an [issue](https://github.com/kubefirst/kubefirst/issues/new/choose). We'll get back to you as soon as possible.
If you are having an issue with kubefirst, we highly suggest that you share the problem with us on our Slack Community (read the next section for more information). If you are certain it's a bug with our platform, you can create an [issue](https://github.com/konstructio/kubefirst/issues/new/choose). We'll get back to you as soon as possible.

## Questions

Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN curl -LO https://s3.us-west-2.amazonaws.com/amazon-eks/1.21.2/2021-07-05/bin
SHELL ["/bin/bash", "-c"]

# Kubefirst cli
RUN curl -LO https://github.com/kubefirst/kubefirst/releases/download/$KUBEFIRST_VERSION/kubefirst_${KUBEFIRST_VERSION:1}_linux_amd64.tar.gz && \
RUN curl -LO https://github.com/konstructio/kubefirst/releases/download/$KUBEFIRST_VERSION/kubefirst_${KUBEFIRST_VERSION:1}_linux_amd64.tar.gz && \
tar -xvzf kubefirst_${KUBEFIRST_VERSION:1}_linux_amd64.tar.gz -C /usr/local/bin/ && \
chmod +x /usr/local/bin/kubefirst && \
rm kubefirst_${KUBEFIRST_VERSION:1}_linux_amd64.tar.gz
Expand Down
12 changes: 5 additions & 7 deletions cmd/akamai/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package akamai
import (
"fmt"

"github.com/kubefirst/kubefirst-api/pkg/constants"
"github.com/kubefirst/kubefirst/internal/common"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/konstructio/kubefirst-api/pkg/constants"
"github.com/konstructio/kubefirst/internal/common"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/spf13/cobra"
)

Expand All @@ -35,7 +35,6 @@ var (
nodeTypeFlag string
nodeCountFlag string
installCatalogApps string
installKubefirstProFlag bool

// RootCredentials
copyArgoCDPasswordToClipboardFlag bool
Expand All @@ -56,7 +55,7 @@ func NewCommand() *cobra.Command {
Long: "kubefirst akamai",
Run: func(cmd *cobra.Command, args []string) {
fmt.Println("To learn more about akamai in kubefirst, run:")
fmt.Println(" kubefirst beta akamai --help")
fmt.Println(" kubefirst akamai --help")

if progress.Progress != nil {
progress.Progress.Quit()
Expand Down Expand Up @@ -99,9 +98,8 @@ func Create() *cobra.Command {
createCmd.Flags().StringVar(&gitlabGroupFlag, "gitlab-group", "", "the GitLab group for the new gitops and metaphor projects - required if using gitlab")
createCmd.Flags().StringVar(&gitopsTemplateBranchFlag, "gitops-template-branch", "", "the branch to clone for the gitops-template repository")
createCmd.Flags().StringVar(&gitopsTemplateURLFlag, "gitops-template-url", "https://github.com/kubefirst/gitops-template.git", "the fully qualified url to the gitops-template repository to clone")
createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma separated values to install after provision")
createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma seperated values to install after provision")
createCmd.Flags().BoolVar(&useTelemetryFlag, "use-telemetry", true, "whether to emit telemetry")
createCmd.Flags().BoolVar(&installKubefirstProFlag, "install-kubefirst-pro", true, "whether or not to install kubefirst pro")

return createCmd
}
Expand Down
26 changes: 12 additions & 14 deletions cmd/akamai/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@ package akamai
import (
"fmt"
"os"
"strings"

internalssh "github.com/kubefirst/kubefirst-api/pkg/ssh"
pkg "github.com/kubefirst/kubefirst-api/pkg/utils"
"github.com/kubefirst/kubefirst/internal/catalog"
"github.com/kubefirst/kubefirst/internal/cluster"
"github.com/kubefirst/kubefirst/internal/gitShim"
"github.com/kubefirst/kubefirst/internal/launch"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/kubefirst/kubefirst/internal/provision"
"github.com/kubefirst/kubefirst/internal/utilities"

internalssh "github.com/konstructio/kubefirst-api/pkg/ssh"
pkg "github.com/konstructio/kubefirst-api/pkg/utils"
"github.com/konstructio/kubefirst/internal/catalog"
"github.com/konstructio/kubefirst/internal/cluster"
"github.com/konstructio/kubefirst/internal/gitShim"
"github.com/konstructio/kubefirst/internal/launch"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/konstructio/kubefirst/internal/provision"
"github.com/konstructio/kubefirst/internal/utilities"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down Expand Up @@ -50,6 +49,7 @@ func createAkamai(cmd *cobra.Command, args []string) error {
utilities.CreateK1ClusterDirectory(clusterNameFlag)

gitAuth, err := gitShim.ValidateGitCredentials(cliFlags.GitProvider, cliFlags.GithubOrg, cliFlags.GitlabGroup)

if err != nil {
progress.Error(err.Error())
return nil
Expand Down Expand Up @@ -79,9 +79,7 @@ func createAkamai(cmd *cobra.Command, args []string) error {
viper.WriteConfig()

k3dClusterCreationComplete := viper.GetBool("launch.deployed")
isK1Debug := strings.ToLower(os.Getenv("K1_LOCAL_DEBUG")) == "true"

if !k3dClusterCreationComplete && !isK1Debug {
if !k3dClusterCreationComplete {
launch.Up(nil, true, cliFlags.UseTelemetry)
}

Expand Down
Loading
Loading