Skip to content

Commit

Permalink
Merge branch 'main' into feat/16242
Browse files Browse the repository at this point in the history
Signed-off-by: Jia-wei Yu <yoga.yu.169@gmail.com>
  • Loading branch information
yo-ga committed Aug 16, 2023
2 parents 399a8b7 + f06fae3 commit 4018b58
Show file tree
Hide file tree
Showing 484 changed files with 21,623 additions and 11,429 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BITNAMI_TEAM='["Akinorev","CeliaGMqrz","ClaaudiaGarcia","FraPazGal","Javirln","Mauraza","agarcia-oss","alemorcuq","alexherp","alvneiayu","andresbono","antgamdia","aoterolorenzo","aruiz14","beltran-rubo","bitnami-bot","carlossm","carrodher","castelblanque","corico44","cscazorla","dani8art","dariver","dgomezleon","fevisera","fjagugar","fmulero","gdelgadot","gfichtenholt","gongomgra","javsalgar","jbianquetti-nami","jiparis","joancafom","jotadrilo","jotamartos","juamedgod","juan131","kaysavps","mdhont","migruiz4","mpermar","pablogalegoc","ppbaena","rafariossaa","rloporp","rogelio-o","ruospalo","tompizmor","xoanteis","zubero"]'
BITNAMI_TEAM='["Akinorev","CeliaGMqrz","ClaaudiaGarcia","FraPazGal","Javirln","Mauraza","agarcia-oss","alemorcuq","alexherp","alvneiayu","andresbono","antgamdia","aoterolorenzo","beltran-rubo","bitnami-bot","carlossm","carrodher","castelblanque","corico44","cscazorla","dani8art","dariver","dgomezleon","fevisera","fjagugar","fmulero","gdelgadot","gfichtenholt","gongomgra","javsalgar","jbianquetti-nami","jiparis","joancafom","jotadrilo","jotamartos","juamedgod","juan131","kaysavps","mdhont","migruiz4","mpermar","pablogalegoc","ppbaena","rafariossaa","rloporp","rogelio-o","ruospalo","tompizmor","xoanteis","zubero"]'
IN_PROGRESS_COLUMN_ID=19057376
TRIAGE_COLUMN_ID=19057374
SOLVED_COLUMN_ID=19057379
Expand Down
107 changes: 1 addition & 106 deletions .github/workflows/cd-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,112 +7,7 @@ on: # rebuild any PRs and main branch changes
branches:
- main
paths:
- 'bitnami/airflow/**'
- 'bitnami/apache/**'
- 'bitnami/apisix/**'
- 'bitnami/appsmith/**'
- 'bitnami/argo-cd/**'
- 'bitnami/argo-workflows/**'
- 'bitnami/aspnet-core/**'
- 'bitnami/cassandra/**'
- 'bitnami/cert-manager/**'
- 'bitnami/clickhouse/**'
- 'bitnami/common/**'
- 'bitnami/concourse/**'
- 'bitnami/consul/**'
- 'bitnami/contour-operator/**'
- 'bitnami/contour/**'
- 'bitnami/discourse/**'
- 'bitnami/dokuwiki/**'
- 'bitnami/drupal/**'
- 'bitnami/ejbca/**'
- 'bitnami/elasticsearch/**'
- 'bitnami/etcd/**'
- 'bitnami/external-dns/**'
- 'bitnami/flink/**'
- 'bitnami/fluentd/**'
- 'bitnami/fluent-bit/**'
- 'bitnami/flux/**'
- 'bitnami/ghost/**'
- 'bitnami/gitea/**'
- 'bitnami/grafana-loki/**'
- 'bitnami/grafana-mimir/**'
- 'bitnami/grafana-operator/**'
- 'bitnami/grafana-tempo/**'
- 'bitnami/grafana/**'
- 'bitnami/haproxy/**'
- 'bitnami/harbor/**'
- 'bitnami/influxdb/**'
- 'bitnami/jaeger/**'
- 'bitnami/jasperreports/**'
- 'bitnami/jenkins/**'
- 'bitnami/joomla/**'
- 'bitnami/jupyterhub/**'
- 'bitnami/kafka/**'
- 'bitnami/keycloak/**'
- 'bitnami/kiam/**'
- 'bitnami/kibana/**'
- 'bitnami/kong/**'
- 'bitnami/kubeapps/**'
- 'bitnami/kube-prometheus/**'
- 'bitnami/kube-state-metrics/**'
- 'bitnami/kubernetes-event-exporter/**'
- 'bitnami/logstash/**'
- 'bitnami/magento/**'
- 'bitnami/mastodon/**'
- 'bitnami/mariadb-galera/**'
- 'bitnami/mariadb/**'
- 'bitnami/matomo/**'
- 'bitnami/mediawiki/**'
- 'bitnami/memcached/**'
- 'bitnami/metallb/**'
- 'bitnami/metrics-server/**'
- 'bitnami/milvus/**'
- 'bitnami/minio/**'
- 'bitnami/mongodb/**'
- 'bitnami/mongodb-sharded/**'
- 'bitnami/moodle/**'
- 'bitnami/multus-cni/**'
- 'bitnami/mxnet/**'
- 'bitnami/mysql/**'
- 'bitnami/nats/**'
- 'bitnami/nginx-ingress-controller/**'
- 'bitnami/nginx/**'
- 'bitnami/node-exporter/**'
- 'bitnami/oauth2-proxy/**'
- 'bitnami/odoo/**'
- 'bitnami/opencart/**'
- 'bitnami/osclass/**'
- 'bitnami/parse/**'
- 'bitnami/phpbb/**'
- 'bitnami/phpmyadmin/**'
- 'bitnami/pinniped/**'
- 'bitnami/postgresql/**'
- 'bitnami/postgresql-ha/**'
- 'bitnami/prestashop/**'
- 'bitnami/prometheus/**'
- 'bitnami/pytorch/**'
- 'bitnami/rabbitmq-cluster-operator/**'
- 'bitnami/rabbitmq/**'
- 'bitnami/redis-cluster/**'
- 'bitnami/redis/**'
- 'bitnami/redmine/**'
- 'bitnami/schema-registry/**'
- 'bitnami/sealed-secrets/**'
- 'bitnami/solr/**'
- 'bitnami/sonarqube/**'
- 'bitnami/spark/**'
- 'bitnami/spring-cloud-dataflow/**'
- 'bitnami/suitecrm/**'
- 'bitnami/supabase/**'
- 'bitnami/tensorflow-resnet/**'
- 'bitnami/thanos/**'
- 'bitnami/tomcat/**'
- 'bitnami/vault/**'
- 'bitnami/whereabouts/**'
- 'bitnami/wildfly/**'
- 'bitnami/wordpress/**'
- 'bitnami/zookeeper/**'
- 'bitnami/**'
- '!**.md'
# Remove all permissions by default.
permissions: {}
Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/license-headers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,20 @@ jobs:
files_changed="$(sed -nr 's/[\-\+]{3} [ab]\/(.*)/\1/p' $TEMP_FILE | sort | uniq)"
templates=()
regular_files=()
is_excluded() {
# Check if a given path contains one of the excluded paths
local -r path="${1:?missing path}"
local -r excluded_paths=("/crds/")
for excluded_path in "${excluded_paths[@]}"; do
if [[ "${path}" =~ ${excluded_path} ]]; then
return 0
fi
done
return 1
}
while read -r file_changed; do
# Avoid removed files
if [[ -f "${file_changed}" ]]; then
# Avoid removed files and excluded files
if [[ -f "${file_changed}" ]] && ! is_excluded "${file_changed}"; then
if [[ "${file_changed}" =~ \/templates\/ ]]; then
templates+=("${file_changed}")
else
Expand All @@ -65,4 +76,4 @@ jobs:
fi
- name: Check license Headers
uses: apache/skywalking-eyes/header@v0.4.0
if: ${{ steps.get-modified-files.outputs.result == 'success' }}
if: ${{ steps.get-modified-files.outputs.result == 'success' }}
3 changes: 3 additions & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ header:
paths:
- "bitnami/**/templates/**/*.yml"
- "bitnami/**/templates/**/*.yaml"
paths-ignore:
- "bitnami/**/templates/crds/**/*.yml"
- "bitnami/**/templates/crds/**/*.yaml"

# License format for all other YAML files
- comment: on-failure
Expand Down
44 changes: 44 additions & 0 deletions .vib/deepspeed/goss/goss.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Copyright VMware, Inc.
# SPDX-License-Identifier: APACHE-2.0

{{- $nodes := .Vars.worker.replicaCount }}
file:
/job/hostfile:
exists: true
contains:
{{- range $i, $e := until $nodes }}
- /deepspeed-worker-{{ $i }}/
{{ end }}
{{ .Vars.client.persistence.mountPath }}:
exists: true
filetype: directory
mode: "2775"
owner: root
addr:
{{ range $e, $i := until $nodes }}
tcp://deepspeed-worker-{{ $i }}-external:{{ $.Vars.worker.externalAccess.service.ports.ssh }}:
reachable: true
timeout: 500
tcp://deepspeed-worker-{{ $i }}.deepspeed-worker-headless:{{ $.Vars.worker.containerPorts.ssh }}:
reachable: true
timeout: 500
{{ end }}
command:
run-git-example:
exec: bash -c ". /opt/bitnami/scripts/deepspeed/entrypoint.sh && cd /app/benchmarks/communication/ && deepspeed all_reduce.py --mem-factor 0.0001"
exit-status: 0
timeout: 900000
{{- $uid := .Vars.client.containerSecurityContext.runAsUser }}
{{- $gid := .Vars.client.podSecurityContext.fsGroup }}
check-user-info:
# The UID and GID should always be either the one specified as vars (always a bigger number that the default)
# or the one randomly defined by openshift (larger values). Othenrwise, the chart is still using the default value.
exec: if [ $(id -u) -lt {{ $uid }} ] || [ $(id -G | awk '{print $2}') -lt {{ $gid }} ]; then exit 1; fi
exit-status: 0
{{ if .Vars.client.serviceAccount.automountServiceAccountToken }}
check-sa:
exec: cat /var/run/secrets/kubernetes.io/serviceaccount/token | cut -d '.' -f 2 | xargs -I '{}' echo '{}====' | fold -w 4 | sed '$ d' | tr -d '\n' | base64 -d
exit-status: 0
stdout:
- /serviceaccount.*name.*deepspeed-client/
{{ end }}
37 changes: 37 additions & 0 deletions .vib/deepspeed/runtime-parameters.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
source:
type: "git"
git:
repository: https://github.com/microsoft/DeepSpeedExamples
revision: master
client:
podSecurityContext:
enabled: true
fsGroup: 1002
containerSecurityContext:
enabled: true
runAsUser: 1002
runAsGroup: 1002
serviceAccount:
create: true
automountServiceAccountToken: true
persistence:
enabled: true
mountPath: /bitnami/deepspeed/vib-test
worker:
replicaCount: 2
containerPorts:
ssh: 3333
# We found an issue when the worker belonged to a group
# different from 1001
podSecurityContext:
enabled: true
fsGroup: 1004
containerSecurityContext:
enabled: true
runAsUser: 1004
runAsGroup: 1004
externalAccess:
enabled: true
service:
ports:
ssh: 4444
68 changes: 68 additions & 0 deletions .vib/deepspeed/vib-publish.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"phases": {
"package": {
"context": {
"resources": {
"url": "{SHA_ARCHIVE}",
"path": "/bitnami/deepspeed"
}
},
"actions": [
{
"action_id": "helm-package"
},
{
"action_id": "helm-lint"
}
]
},
"verify": {
"context": {
"resources": {
"url": "{SHA_ARCHIVE}",
"path": "/bitnami/deepspeed"
},
"target_platform": {
"target_platform_id": "{VIB_ENV_TARGET_PLATFORM}",
"size": {
"name": "L4"
}
}
},
"actions": [
{
"action_id": "goss",
"params": {
"resources": {
"path": "/.vib"
},
"tests_file": "deepspeed/goss/goss.yaml",
"vars_file": "deepspeed/runtime-parameters.yaml",
"remote": {
"pod": {
"workload": "deploy-deepspeed-client"
}
}
}
}
]
},
"publish": {
"actions": [
{
"action_id": "helm-publish",
"params": {
"repository": {
"kind": "S3",
"url": "{VIB_ENV_S3_URL}",
"authn": {
"access_key_id": "{VIB_ENV_S3_ACCESS_KEY_ID}",
"secret_access_key": "{VIB_ENV_S3_SECRET_ACCESS_KEY}"
}
}
}
}
]
}
}
}
51 changes: 51 additions & 0 deletions .vib/deepspeed/vib-verify.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"phases": {
"package": {
"context": {
"resources": {
"url": "{SHA_ARCHIVE}",
"path": "/bitnami/deepspeed"
}
},
"actions": [
{
"action_id": "helm-package"
},
{
"action_id": "helm-lint"
}
]
},
"verify": {
"context": {
"resources": {
"url": "{SHA_ARCHIVE}",
"path": "/bitnami/deepspeed"
},
"target_platform": {
"target_platform_id": "{VIB_ENV_TARGET_PLATFORM}",
"size": {
"name": "L4"
}
}
},
"actions": [
{
"action_id": "goss",
"params": {
"resources": {
"path": "/.vib"
},
"tests_file": "deepspeed/goss/goss.yaml",
"vars_file": "deepspeed/runtime-parameters.yaml",
"remote": {
"pod": {
"workload": "deploy-deepspeed-client"
}
}
}
}
]
}
}
}
3 changes: 2 additions & 1 deletion .vib/jupyterhub/cypress/cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ Cypress.Commands.add(
cy.get('#password_input').type(password);
cy.get('#login_submit').click();
// The authentication is not completed until the page is rendered
cy.contains('Launcher');
// Accessing the for the first time may take extra-time: "Your server is starting up"
cy.contains('Launcher', {timeout: 60000});
}
);

Expand Down
2 changes: 2 additions & 0 deletions .vib/jupyterhub/goss/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# SPDX-License-Identifier: APACHE-2.0

http:
# For this test to work, the pod should have the proper label to allow ingress
# traffic as per the NetworkPolicy
http://jupyterhub-hub:{{ .Vars.hub.service.ports.http }}/hub/health:
status: 200
http://jupyterhub-proxy-api:{{ .Vars.proxy.service.api.ports.http }}:
Expand Down
3 changes: 3 additions & 0 deletions .vib/jupyterhub/runtime-parameters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ hub:
automountServiceAccountToken: true
rbac:
create: true
# The label is needed for GOSS tests
podLabels:
hub.jupyter.org/network-access-hub: "true"
service:
ports:
http: 8082
Expand Down
Loading

0 comments on commit 4018b58

Please sign in to comment.