Skip to content

Commit

Permalink
Merge branch 'main' into feature/workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
tobybellwood authored Mar 14, 2022
2 parents 14fd773 + aaa276c commit 670530a
Show file tree
Hide file tree
Showing 164 changed files with 4,463 additions and 780 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ jobs:
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-quiet-mode: 'yes'
folder-path: 'docs'
folder-path: 'docs'
config-file: 'docs/markdown-link-check.config.json'
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pipeline {
stage ('collect logs') {
steps {
sh script: "while [ ! -f ./kubeconfig.kind.${CI_BUILD_TAG} ]; do sleep 1; done", label: "Check for kubeconfig created"
timeout(time: 30, unit: 'MINUTES') {
timeout(time: 45, unit: 'MINUTES') {
sh script: "./local-dev/stern --kubeconfig ./kubeconfig.kind.${CI_BUILD_TAG} --all-namespaces '^[a-z]' -t > test-suite-0.txt || true", label: "Collecting test-suite-0 logs"
}
sh script: "cat test-suite-0.txt", label: "View ${NODE_NAME}:${WORKSPACE}/test-suite-0.txt"
Expand Down Expand Up @@ -108,7 +108,7 @@ pipeline {
stage ('2: run second test suite') {
steps {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
sh script: "make -j$NPROC kind/retest TESTS=[gitlab,github,bitbucket,python,node-mongodb,elasticsearch,image-cache,workflows] BRANCH_NAME=${SAFEBRANCH_NAME}", label: "Running second test suite on kind cluster"
sh script: "make -j$NPROC kind/retest TESTS=[bulk-deployment,gitlab,github,bitbucket,python,node-mongodb,elasticsearch,image-cache,workflows] BRANCH_NAME=${SAFEBRANCH_NAME}", label: "Running second test suite on kind cluster"
}
sh script: "pkill -f './local-dev/stern'", label: "Closing off test-suite-2 log after test completion"
}
Expand Down
15 changes: 9 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ services := api \
api-redis \
auth-server \
auto-idler \
actions-handler \
backup-handler \
broker \
broker-single \
Expand Down Expand Up @@ -220,6 +221,7 @@ $(build-services):
build/auth-server build/logs2email build/logs2slack build/logs2rocketchat build/logs2s3 build/logs2webhook build/logs2microsoftteams build/backup-handler build/controllerhandler build/webhook-handler build/webhooks2tasks build/api build/ui: build/yarn-workspace-builder
build/api-db: services/api-db/Dockerfile
build/api-redis: services/api-redis/Dockerfile
build/actions-handler: services/actions-handler/Dockerfile
build/auto-idler: build/oc
build/broker-single: services/broker/Dockerfile
build/broker: build/broker-single
Expand Down Expand Up @@ -296,7 +298,7 @@ wait-for-keycloak:
grep -m 1 "Config of Keycloak done." <(docker-compose -p $(CI_BUILD_TAG) --compatibility logs -f keycloak 2>&1)

# Define a list of which Lagoon Services are needed for running any deployment testing
main-test-services = broker logs2email logs2slack logs2rocketchat logs2microsoftteams logs2s3 logs2webhook api api-db api-redis keycloak keycloak-db ssh auth-server local-git local-api-data-watcher-pusher local-minio
main-test-services = actions-handler broker logs2email logs2slack logs2rocketchat logs2microsoftteams logs2s3 logs2webhook api api-db api-redis keycloak keycloak-db ssh auth-server local-git local-api-data-watcher-pusher local-minio

# List of Lagoon Services needed for webhook endpoint testing
webhooks-test-services = webhook-handler webhooks2tasks backup-handler
Expand Down Expand Up @@ -500,19 +502,19 @@ api-development: build/api build/api-db build/local-api-data-watcher-pusher buil
IMAGE_REPO=$(CI_BUILD_TAG) docker-compose -p $(CI_BUILD_TAG) --compatibility up -d api api-db local-api-data-watcher-pusher keycloak keycloak-db broker api-redis

.PHONY: ui-logs-development
ui-logs-development: build/api build/api-db build/local-api-data-watcher-pusher build/ui build/keycloak build/keycloak-db build/broker-single build/api-redis build/logs2s3 build/local-minio
IMAGE_REPO=$(CI_BUILD_TAG) docker-compose -p $(CI_BUILD_TAG) --compatibility up -d api api-db local-api-data-watcher-pusher ui keycloak keycloak-db broker api-redis logs2s3 local-minio
ui-logs-development: build/actions-handler build/api build/api-db build/local-api-data-watcher-pusher build/ui build/keycloak build/keycloak-db build/broker-single build/api-redis build/logs2s3 build/local-minio
IMAGE_REPO=$(CI_BUILD_TAG) docker-compose -p $(CI_BUILD_TAG) --compatibility up -d api api-db actions-handler local-api-data-watcher-pusher ui keycloak keycloak-db broker api-redis logs2s3 local-minio

## CI targets

KUBECTL_VERSION := v1.21.1
HELM_VERSION := v3.6.0
KIND_VERSION = v0.11.1
KIND_VERSION = v0.12.0
GOJQ_VERSION = v0.12.5
STERN_VERSION = 2.1.17
CHART_TESTING_VERSION = v3.4.0
KIND_IMAGE = kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
TESTS = [nginx,api,features-kubernetes,features-kubernetes-2,features-api-variables,active-standby-kubernetes,tasks,drush,drupal-php80,drupal-postgres,python,gitlab,github,bitbucket,node-mongodb,elasticsearch,workflows]
TESTS = [nginx,api,features-kubernetes,bulk-deployment,features-kubernetes-2,features-api-variables,active-standby-kubernetes,tasks,drush,drupal-php80,drupal-postgres,python,gitlab,github,bitbucket,node-mongodb,elasticsearch,workflows]
CHARTS_TREEISH = "feature/workflows"

# Symlink the installed kubectl client if the correct version is already
Expand Down Expand Up @@ -586,6 +588,7 @@ helm/repos: local-dev/helm
./local-dev/helm repo add amazeeio https://amazeeio.github.io/charts/
./local-dev/helm repo add lagoon https://uselagoon.github.io/lagoon-charts/
./local-dev/helm repo add minio https://helm.min.io/
./local-dev/helm repo add nats https://nats-io.github.io/k8s/helm/charts/
./local-dev/helm repo update

# stand up a kind cluster configured appropriately for lagoon testing
Expand Down Expand Up @@ -631,7 +634,7 @@ ifeq ($(ARCH), darwin)
tcp-listen:32080,fork,reuseaddr tcp-connect:target:32080
endif

KIND_SERVICES = api api-db api-redis auth-server broker controllerhandler docker-host drush-alias keycloak keycloak-db logs2s3 webhook-handler webhooks2tasks kubectl-build-deploy-dind local-api-data-watcher-pusher local-git ssh tests ui workflows
KIND_SERVICES = api api-db api-redis auth-server actions-handler broker controllerhandler docker-host drush-alias keycloak keycloak-db logs2s3 webhook-handler webhooks2tasks kubectl-build-deploy-dind local-api-data-watcher-pusher local-git ssh tests ui workflows
KIND_TESTS = local-api-data-watcher-pusher local-git tests
KIND_TOOLS = kind helm kubectl jq stern

Expand Down
9 changes: 8 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,15 @@ services:
- ./services/ui/.env.defaults:/app/services/ui/.env.defaults
- ./services/ui/.env.schema:/app/services/ui/.env.schema
- ./services/ui/package.json:/app/services/ui/package.json
environment:
- NODE_ENV=development
ports:
- '8888:3000'
- '8888:3003'
actions-handler:
image: ${IMAGE_REPO:-lagoon}/actions-handler
restart: on-failure
depends_on:
- broker
ssh:
image: ${IMAGE_REPO:-lagoon}/ssh
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion docs/administering-lagoon/rbac.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Here is a table that lists the roles and the access they have:
| deleteOpenshift | openshift | delete | | Yes | Yes | No | No | No | No | No | |
| deleteAllOpenshifts | openshift | deleteAll | | Yes | Yes | No | No | No | No | No | |
| getAllOpenshifts | openshift | viewAll | | Yes | No | No | No | No | No | No | |
| getOpenshiftByProjectId | openshift | view | projectID | Yes | Yes | Yes | Yes | No | No | No | |
| getOpenshiftByProjectId | openshift | view | projectID | Yes | Yes | Yes | Yes | Yes | Yes | Yes | |
| addNotificationToProject | project | addNotification | projectID | Yes | Yes | Yes | Yes | No | No | No | |
| removeNotificationFromProject | project | removeNotification | projectID | Yes | Yes | Yes | Yes | No | No | No | |
| addProject | project | add | | Yes | Yes | Yes | Yes | Yes | Yes | Yes | |
Expand Down
Binary file added docs/images/assets/Lagoon-2-Symbol.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 670530a

Please sign in to comment.