Fix CI check

Signed-off-by: Tom Chauveau <tom.chauveau@epitech.eu>
This commit is contained in:
Tom Chauveau 2021-09-10 10:44:12 +02:00 committed by Sam Alba
parent 083fee85a5
commit d34200c9f6
4 changed files with 61 additions and 43 deletions

View File

@ -16,17 +16,28 @@ Create an ArgoCD application
### argocd.#App Inputs ### argocd.#App Inputs
| Name | Type | Description | | Name | Type | Description |
| ------------- |:-------------: |:-------------: | | ------------- |:-------------: |:-------------: |
|*config.version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version | |*config.version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version |
|*config.server* | `string` |ArgoCD server | |*config.server* | `string` |ArgoCD server |
|*config.project* | `*"default" \| string` |ArgoCD project | |*config.project* | `*"default" \| string` |ArgoCD project |
|*config.token* | `dagger.#Secret` |ArgoCD authentication token | |*config.username* | `string` |Username |
|*name* | `string` |App name | |*config.password* | `dagger.#Secret` |Password |
|*repo* | `string` |Repository url (git or helm) | |*name* | `string` |App name |
|*path* | `string` |Folder to deploy | |*repo* | `string` |Repository url (git or helm) |
|*server* | `*"https://kubernetes.default.svc" \| string` |Destination server | |*path* | `string` |Folder to deploy |
|*namespace* | `*"default" \| string` |Destination namespace | |*server* | `*"https://kubernetes.default.svc" \| string` |Destination server |
|*namespace* | `*"default" \| string` |Destination namespace |
|*ctr.image.config.version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version |
|*ctr.image.config.server* | `string` |ArgoCD server |
|*ctr.image.config.project* | `*"default" \| string` |ArgoCD project |
|*ctr.image.config.username* | `string` |Username |
|*ctr.image.config.password* | `dagger.#Secret` |Password |
|*ctr.env.APP_NAME* | `string` |- |
|*ctr.env.APP_REPO* | `string` |- |
|*ctr.env.APP_PATH* | `string` |- |
|*ctr.env.APP_SERVER* | `*"https://kubernetes.default.svc" \| string` |- |
|*ctr.env.APP_NAMESPACE* | `*"default" \| string` |- |
### argocd.#App Outputs ### argocd.#App Outputs
@ -38,12 +49,13 @@ Re-usable CLI component
### argocd.#CLI Inputs ### argocd.#CLI Inputs
| Name | Type | Description | | Name | Type | Description |
| ------------- |:-------------: |:-------------: | | ------------- |:-------------: |:-------------: |
|*config.version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version | |*config.version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version |
|*config.server* | `string` |ArgoCD server | |*config.server* | `string` |ArgoCD server |
|*config.project* | `*"default" \| string` |ArgoCD project | |*config.project* | `*"default" \| string` |ArgoCD project |
|*config.token* | `dagger.#Secret` |ArgoCD authentication token | |*config.username* | `string` |Username |
|*config.password* | `dagger.#Secret` |Password |
### argocd.#CLI Outputs ### argocd.#CLI Outputs
@ -55,12 +67,13 @@ ArgoCD configuration
### argocd.#Config Inputs ### argocd.#Config Inputs
| Name | Type | Description | | Name | Type | Description |
| ------------- |:-------------: |:-------------: | | ------------- |:-------------: |:-------------: |
|*version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version | |*version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version |
|*server* | `string` |ArgoCD server | |*server* | `string` |ArgoCD server |
|*project* | `*"default" \| string` |ArgoCD project | |*project* | `*"default" \| string` |ArgoCD project |
|*token* | `dagger.#Secret` |ArgoCD authentication token | |*username* | `string` |Username |
|*password* | `dagger.#Secret` |Password |
### argocd.#Config Outputs ### argocd.#Config Outputs
@ -72,13 +85,14 @@ Get application's status
### argocd.#Status Inputs ### argocd.#Status Inputs
| Name | Type | Description | | Name | Type | Description |
| ------------- |:-------------: |:-------------: | | ------------- |:-------------: |:-------------: |
|*config.version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version | |*config.version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version |
|*config.server* | `string` |ArgoCD server | |*config.server* | `string` |ArgoCD server |
|*config.project* | `*"default" \| string` |ArgoCD project | |*config.project* | `*"default" \| string` |ArgoCD project |
|*config.token* | `dagger.#Secret` |ArgoCD authentication token | |*config.username* | `string` |Username |
|*name* | `string` |ArgoCD application | |*config.password* | `dagger.#Secret` |Password |
|*name* | `string` |ArgoCD application |
### argocd.#Status Outputs ### argocd.#Status Outputs
@ -97,14 +111,21 @@ Sync an application to its targer state
### argocd.#Sync Inputs ### argocd.#Sync Inputs
| Name | Type | Description | | Name | Type | Description |
| ------------- |:-------------: |:-------------: | | ------------- |:-------------: |:-------------: |
|*config.version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version | |*config.version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version |
|*config.server* | `string` |ArgoCD server | |*config.server* | `string` |ArgoCD server |
|*config.project* | `*"default" \| string` |ArgoCD project | |*config.project* | `*"default" \| string` |ArgoCD project |
|*config.token* | `dagger.#Secret` |ArgoCD authentication token | |*config.username* | `string` |Username |
|*application* | `string` |ArgoCD application | |*config.password* | `dagger.#Secret` |Password |
|*wait* | `*false \| bool` |Wait the application to sync correctly | |*application* | `string` |ArgoCD application |
|*wait* | `*false \| bool` |Wait the application to sync correctly |
|*ctr.image.config.version* | `*"v2.0.5" \| string` |ArgoCD CLI binary version |
|*ctr.image.config.server* | `string` |ArgoCD server |
|*ctr.image.config.project* | `*"default" \| string` |ArgoCD project |
|*ctr.image.config.username* | `string` |Username |
|*ctr.image.config.password* | `dagger.#Secret` |Password |
|*ctr.env.APPLICATION* | `string` |- |
### argocd.#Sync Outputs ### argocd.#Sync Outputs

View File

@ -47,9 +47,7 @@ import (
argocd app get "$APPLICATION" --output json | jq '{health:.status.health.status,sync:.status.sync.status,namespace:.spec.destination.namespace,server:.spec.destination.server,urls:(.status.summary.externalURLs//[]|join(",")),state:.status.operationState.message}' > /output.json argocd app get "$APPLICATION" --output json | jq '{health:.status.health.status,sync:.status.sync.status,namespace:.spec.destination.namespace,server:.spec.destination.server,urls:(.status.summary.externalURLs//[]|join(",")),state:.status.operationState.message}' > /output.json
"""#, """#,
] ]
env: { env: APPLICATION: name
APPLICATION: name
}
}, },
op.#Export & { op.#Export & {

View File

@ -74,7 +74,7 @@ skip_unless_local_localstack() {
# #
# This is need to do kubernetes test in the CI. # This is need to do kubernetes test in the CI.
skip_unless_local_kube() { skip_unless_local_kube() {
if [ -f ~/.kube/config ] && grep -q "user: kind-kind" ~/.kube/config &> /dev/null && grep -q "127.0.0.1" ~/.kube/config &> /dev/null; then if [ -f ~/.kube/config ] && grep -q "127.0.0.1" ~/.kube/config &> /dev/null; then
echo "Kubernetes available" echo "Kubernetes available"
else else
skip "local kubernetes cluster not available" skip "local kubernetes cluster not available"

View File

@ -224,7 +224,6 @@ setup() {
# Forward port # Forward port
kubectl port-forward svc/argocd-server -n argocd 8080:443 >/dev/null 2>/dev/null & kubectl port-forward svc/argocd-server -n argocd 8080:443 >/dev/null 2>/dev/null &
pid=$!
sleep 3 sleep 3
# Run test # Run test