This is an automated email from the ASF dual-hosted git repository. sciabarracom pushed a commit to branch 0.9.0-rebranding in repository https://gitbox.apache.org/repos/asf/openserverless-admin-api.git
commit 3f8c9386df42040857180812abaf0fd04d63b26a Author: Michele Sciabarra <[email protected]> AuthorDate: Tue Sep 1 20:12:02 2026 +0200 rebranding --- .gitignore | 2 +- .vscode/start-port-forwards.sh | 8 ++-- .vscode/tasks.json | 2 +- Taskfile.yml | 2 +- TaskfileBuilder.yml | 12 +++--- TaskfileDev.yml | 16 ++++---- deploy/buildkit/buildkitd.toml | 2 +- olaris-api/api-template.yaml | 22 +++++------ olaris-api/nginx-template.yaml | 6 +-- olaris-api/opsfile.yml | 16 ++++---- olaris-api/traefik-template.yaml | 6 +-- openserverless/common/kube_api_client.py | 52 +++++++++++++------------- openserverless/common/validation.py | 2 +- openserverless/common/whisk_user_data.py | 4 +- openserverless/common/whisk_user_generator.py | 4 +- openserverless/couchdb/couchdb_util.py | 2 +- openserverless/impl/auth/auth_service.py | 2 +- openserverless/impl/builder/build_service.py | 22 +++++------ openserverless/impl/onboard/user_validation.py | 4 +- openserverless/security/ow_authorize.py | 2 +- 20 files changed, 94 insertions(+), 94 deletions(-) diff --git a/.gitignore b/.gitignore index 60a5c02..5ae1695 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,7 @@ clusters/worker.yaml *.kubeconfig run.pid *.off -actions/**/nuvolaris/ +actions/**/openserverless/ !actions/**/__main__.py _*.yaml apihost.txt diff --git a/.vscode/start-port-forwards.sh b/.vscode/start-port-forwards.sh index b631c73..6126b5d 100755 --- a/.vscode/start-port-forwards.sh +++ b/.vscode/start-port-forwards.sh @@ -22,18 +22,18 @@ set -e echo "$(date): Starting port forwards..." >> /tmp/pf-start.log # Clean up any existing port forwards first -pkill -f 'kubectl port-forward -n nuvolaris registry-0' 2>/dev/null || true -pkill -f 'kubectl -n nuvolaris port-forward couchdb-0' 2>/dev/null || true +pkill -f 'kubectl port-forward -n openserverless registry-0' 2>/dev/null || true +pkill -f 'kubectl -n openserverless port-forward couchdb-0' 2>/dev/null || true rm -f /tmp/pf-registry.pid /tmp/pf-couchdb.pid /tmp/pf-registry.log /tmp/pf-couchdb.log sleep 1 # Start port forwards in background with nohup to detach from terminal -nohup kubectl port-forward -n nuvolaris registry-0 5000:5000 > /tmp/pf-registry.log 2>&1 & +nohup kubectl port-forward -n openserverless registry-0 5000:5000 > /tmp/pf-registry.log 2>&1 & REGISTRY_PID=$! echo $REGISTRY_PID > /tmp/pf-registry.pid echo "$(date): Registry PID: $REGISTRY_PID" >> /tmp/pf-start.log -nohup kubectl -n nuvolaris port-forward couchdb-0 5984:5984 > /tmp/pf-couchdb.log 2>&1 & +nohup kubectl -n openserverless port-forward couchdb-0 5984:5984 > /tmp/pf-couchdb.log 2>&1 & COUCHDB_PID=$! echo $COUCHDB_PID > /tmp/pf-couchdb.pid echo "$(date): CouchDB PID: $COUCHDB_PID" >> /tmp/pf-start.log diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 118e933..50a531d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -29,7 +29,7 @@ { "label": "Stop Port Forwards", "type": "shell", - "command": "test -f /tmp/pf-registry.pid && kill $(cat /tmp/pf-registry.pid) 2>/dev/null; test -f /tmp/pf-couchdb.pid && kill $(cat /tmp/pf-couchdb.pid) 2>/dev/null; rm -f /tmp/pf-registry.pid /tmp/pf-registry.log /tmp/pf-couchdb.pid /tmp/pf-couchdb.log; pkill -f 'kubectl port-forward -n nuvolaris registry-0' 2>/dev/null; pkill -f 'kubectl -n nuvolaris port-forward couchdb-0' 2>/dev/null; echo 'Port forwards stopped'; exit 0", + "command": "test -f /tmp/pf-registry.pid && kill $(cat /tmp/pf-registry.pid) 2>/dev/null; test -f /tmp/pf-couchdb.pid && kill $(cat /tmp/pf-couchdb.pid) 2>/dev/null; rm -f /tmp/pf-registry.pid /tmp/pf-registry.log /tmp/pf-couchdb.pid /tmp/pf-couchdb.log; pkill -f 'kubectl port-forward -n openserverless registry-0' 2>/dev/null; pkill -f 'kubectl -n openserverless port-forward couchdb-0' 2>/dev/null; echo 'Port forwards stopped'; exit 0", "presentation": { "echo": true, "reveal": "silent", diff --git a/Taskfile.yml b/Taskfile.yml index 173d7de..52b8fe8 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -126,7 +126,7 @@ tasks: - | BASEIMG=$(task base-image-name) IMG="$BASEIMG:{{.TAG}}" - kind load docker-image $IMG --name=nuvolaris + kind load docker-image $IMG --name=openserverless utest: cmds: diff --git a/TaskfileBuilder.yml b/TaskfileBuilder.yml index b0b81b1..706f138 100644 --- a/TaskfileBuilder.yml +++ b/TaskfileBuilder.yml @@ -60,24 +60,24 @@ tasks: logs: desc: Show logs of the last build job cmds: - - kubectl -n nuvolaris logs $(kubectl get jobs.batch -o name | grep "build-") -c buildkit --follow + - kubectl -n openserverless logs $(kubectl get jobs.batch -o name | grep "build-") -c buildkit --follow silent: false cleanjobs: desc: Clean up old jobs cmds: - - for I in $(kubectl get jobs -n nuvolaris | grep build | awk '{ print $1 }' | tr "\n" " "); do kubectl delete job $I; done - - for I in $(kubectl get cm -n nuvolaris | grep "cm-" | awk '{ print $1 }' | tr "\n" " "); do kubectl delete cm $I; done + - for I in $(kubectl get jobs -n openserverless | grep build | awk '{ print $1 }' | tr "\n" " "); do kubectl delete job $I; done + - for I in $(kubectl get cm -n openserverless | grep "cm-" | awk '{ print $1 }' | tr "\n" " "); do kubectl delete cm $I; done silent: true updatetoml: desc: Update the buildkitd.toml file config map cmds: - | - if test $(kubectl -n nuvolaris get cm -o name | grep nuvolaris-buildkitd-conf | wc -l) -gt 0; - then kubectl -n nuvolaris delete configmap nuvolaris-buildkitd-conf + if test $(kubectl -n openserverless get cm -o name | grep openserverless-buildkitd-conf | wc -l) -gt 0; + then kubectl -n openserverless delete configmap openserverless-buildkitd-conf fi - - kubectl -n nuvolaris create configmap nuvolaris-buildkitd-conf --from-file=deploy/buildkit/buildkitd.toml + - kubectl -n openserverless create configmap openserverless-buildkitd-conf --from-file=deploy/buildkit/buildkitd.toml silent: true list-catalogs: diff --git a/TaskfileDev.yml b/TaskfileDev.yml index c226323..bc18dbd 100644 --- a/TaskfileDev.yml +++ b/TaskfileDev.yml @@ -24,19 +24,19 @@ tasks: silent: true cmds: - mkdir -p tokens - - rm -f tokens/token && kubectl -n nuvolaris exec -it nuvolaris-operator-0 -- cat /var/run/secrets/kubernetes.io/serviceaccount/token > tokens/token - - rm -f tokens/ca.crt && kubectl -n nuvolaris exec -it nuvolaris-operator-0 -- cat /var/run/secrets/kubernetes.io/serviceaccount/ca.crt > tokens/ca.crt + - rm -f tokens/token && kubectl -n openserverless exec -it openserverless-operator-0 -- cat /var/run/secrets/kubernetes.io/serviceaccount/token > tokens/token + - rm -f tokens/ca.crt && kubectl -n openserverless exec -it openserverless-operator-0 -- cat /var/run/secrets/kubernetes.io/serviceaccount/ca.crt > tokens/ca.crt setup-developer: desc: "Setup developer environment" silent: false vars: REGISTRY_PASS: - sh: ops util kubectl -- -n nuvolaris get cm/config -o jsonpath='{.metadata.annotations.registry_password}' + sh: ops util kubectl -- -n openserverless get cm/config -o jsonpath='{.metadata.annotations.registry_password}' COUCHDB_PASS: - sh: ops util kubectl -- -n nuvolaris get whisk -o jsonpath='{.items[0].spec.couchdb.admin.password}' + sh: ops util kubectl -- -n openserverless get whisk -o jsonpath='{.items[0].spec.couchdb.admin.password}' KUB_SERVICE_PORT: - sh: "docker port nuvolaris-control-plane | grep 6443 | cut -d: -f2" + sh: "docker port openserverless-control-plane | grep 6443 | cut -d: -f2" cmds: - task: get-tokens - | @@ -58,9 +58,9 @@ tasks: desc: "Create docker-registry secret for development using credentials from .env" dotenv: ['.env'] cmds: - - kubectl delete secret registry-pull-secret-dev -n nuvolaris 2>/dev/null || true - - kubectl create secret docker-registry registry-pull-secret-dev -n nuvolaris --docker-server=${REGISTRY_HOST} --docker-username=${REGISTRY_USER} --docker-password=${REGISTRY_PASS} - - echo "Secret 'registry-pull-secret-dev' created successfully in namespace 'nuvolaris'" + - kubectl delete secret registry-pull-secret-dev -n openserverless 2>/dev/null || true + - kubectl create secret docker-registry registry-pull-secret-dev -n openserverless --docker-server=${REGISTRY_HOST} --docker-username=${REGISTRY_USER} --docker-password=${REGISTRY_PASS} + - echo "Secret 'registry-pull-secret-dev' created successfully in namespace 'openserverless'" - ops env add REGISTRY_SECRET=registry-pull-secret-dev - echo "Environment variable REGISTRY_SECRET set to 'registry-pull-secret-dev'" - | diff --git a/deploy/buildkit/buildkitd.toml b/deploy/buildkit/buildkitd.toml index 37460c4..0a3c3ce 100644 --- a/deploy/buildkit/buildkitd.toml +++ b/deploy/buildkit/buildkitd.toml @@ -30,7 +30,7 @@ # ========================= # Registry HTTP insicuro # ========================= -[registry."nuvolaris-registry-svc:5000"] +[registry."openserverless-registry-svc:5000"] #insecure = true http = true diff --git a/olaris-api/api-template.yaml b/olaris-api/api-template.yaml index ced1468..f50c69f 100644 --- a/olaris-api/api-template.yaml +++ b/olaris-api/api-template.yaml @@ -17,24 +17,24 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - name: nuvolaris-system-api - namespace: nuvolaris + name: openserverless-system-api + namespace: openserverless labels: - app: nuvolaris-system-api + app: openserverless-system-api spec: replicas: 1 selector: matchLabels: - app: nuvolaris-system-api + app: openserverless-system-api template: metadata: labels: - name: nuvolaris-system-api - app: nuvolaris-system-api + name: openserverless-system-api + app: openserverless-system-api spec: - serviceAccount: nuvolaris-wsku + serviceAccount: openserverless-wsku containers: - - name: nuvolaris-system-api + - name: openserverless-system-api image: ${IMAGES_SYSTEMAPI} imagePullPolicy: Always command: ["./run.sh"] @@ -56,11 +56,11 @@ spec: apiVersion: v1 kind: Service metadata: - name: nuvolaris-system-api - namespace: nuvolaris + name: openserverless-system-api + namespace: openserverless spec: ports: - name: api port: 5000 selector: - app: nuvolaris-system-api \ No newline at end of file + app: openserverless-system-api \ No newline at end of file diff --git a/olaris-api/nginx-template.yaml b/olaris-api/nginx-template.yaml index 7a8c986..e8e32a8 100644 --- a/olaris-api/nginx-template.yaml +++ b/olaris-api/nginx-template.yaml @@ -22,8 +22,8 @@ metadata: nginx.ingress.kubernetes.io/proxy-connect-timeout: "300" nginx.ingress.kubernetes.io/proxy-read-timeout: "300" nginx.ingress.kubernetes.io/proxy-send-timeout: "300" - name: nuvolaris-system-api-ingress - namespace: nuvolaris + name: openserverless-system-api-ingress + namespace: openserverless spec: ingressClassName: nginx rules: @@ -32,7 +32,7 @@ spec: paths: - backend: service: - name: nuvolaris-system-api + name: openserverless-system-api port: number: 5000 path: /system diff --git a/olaris-api/opsfile.yml b/olaris-api/opsfile.yml index 68ce3ae..c44874f 100644 --- a/olaris-api/opsfile.yml +++ b/olaris-api/opsfile.yml @@ -36,13 +36,13 @@ env: SYS_API_CDB_HOST: couchdb SYS_API_CDB_USER: - sh: $OPS debug kube ctl CMD="-n nuvolaris get wsk/controller -o jsonpath='{.spec.couchdb.admin.user}'" + sh: $OPS debug kube ctl CMD="-n openserverless get wsk/controller -o jsonpath='{.spec.couchdb.admin.user}'" SYS_API_CDB_PASSWORD: - sh: $OPS debug kube ctl CMD="-n nuvolaris get wsk/controller -o jsonpath='{.spec.couchdb.admin.password}'" + sh: $OPS debug kube ctl CMD="-n openserverless get wsk/controller -o jsonpath='{.spec.couchdb.admin.password}'" SYS_API_HOSTNAME: - sh: $OPS debug kube ctl CMD="-n nuvolaris get ingress/apihost -o jsonpath='{.spec.rules[0].host}'" + sh: $OPS debug kube ctl CMD="-n openserverless get ingress/apihost -o jsonpath='{.spec.rules[0].host}'" INGRESS_TYPE: sh: $OPS util ingress-type @@ -58,9 +58,9 @@ tasks: - test -n "$IMAGES_SYSTEMAPI" || die "IMAGES_SYSTEMAPI is not set. Please set it to the desired image version." - envsubst -i api-template.yaml -o _api.yaml > /dev/null 2>&1 - envsubst -i ${INGRESS_TYPE}-template.yaml -o _ingress.yaml > /dev/null 2>&1 - - kubectl -n nuvolaris apply -f _api.yaml + - kubectl -n openserverless apply -f _api.yaml #- cat _ingress.yaml - - kubectl -n nuvolaris apply -f _ingress.yaml + - kubectl -n openserverless apply -f _ingress.yaml - | echo "Admin API deployed with HOSTNAME: ${SYS_API_HOSTNAME}/system" @@ -69,7 +69,7 @@ tasks: desc: undeploy the admin api ignore_error: true cmds: - - kubectl -n nuvolaris delete sts/nuvolaris-system-api ing/nuvolaris-system-api-ingress svc/nuvolaris-system-api + - kubectl -n openserverless delete sts/openserverless-system-api ing/openserverless-system-api-ingress svc/openserverless-system-api - | echo "System API undeployed" @@ -79,11 +79,11 @@ tasks: desc: update the OpenServerless Admin Api stateful set cmds: - task: deploy - - kubectl -n nuvolaris rollout restart statefulset nuvolaris-system-api + - kubectl -n openserverless rollout restart statefulset openserverless-system-api preconditions: - sh: '[ $IMAGES_SYSTEMAPI != $CURRENT_API_VERSION ]' msg: "Current OpenServerless system API stateful set it is already updated to newest version. Request ignored." env: CURRENT_API_VERSION: sh: | - echo $(kubectl -n nuvolaris get pod/nuvolaris-system-api-0 -ojsonpath='{.spec.containers[0].image}') \ No newline at end of file + echo $(kubectl -n openserverless get pod/openserverless-system-api-0 -ojsonpath='{.spec.containers[0].image}') \ No newline at end of file diff --git a/olaris-api/traefik-template.yaml b/olaris-api/traefik-template.yaml index dff4420..7c263cb 100644 --- a/olaris-api/traefik-template.yaml +++ b/olaris-api/traefik-template.yaml @@ -22,8 +22,8 @@ metadata: traefik.ingress.kubernetes.io/transport.respondingTimeouts.idleTimeout: "600" traefik.ingress.kubernetes.io/transport.respondingTimeouts.readTimeout: "600" traefik.ingress.kubernetes.io/transport.respondingTimeouts.writeTimeout: "600" - name: nuvolaris-system-api-ingress - namespace: nuvolaris + name: openserverless-system-api-ingress + namespace: openserverless spec: rules: - host: ${SYS_API_HOSTNAME:-localhost} @@ -31,7 +31,7 @@ spec: paths: - backend: service: - name: nuvolaris-system-api + name: openserverless-system-api port: number: 5000 path: /system diff --git a/openserverless/common/kube_api_client.py b/openserverless/common/kube_api_client.py index d78c163..b1299cd 100644 --- a/openserverless/common/kube_api_client.py +++ b/openserverless/common/kube_api_client.py @@ -101,14 +101,14 @@ class KubeApiClient: raise ConfigException("Token file exists but empty.") self.token = "Bearer " + content - def create_whisk_user(self, whisk_user_dict, namespace="nuvolaris"): + def create_whisk_user(self, whisk_user_dict, namespace="openserverless"): """ " Creates a whisk user using a POST operation param: whisk_user_dict a dictionary representing the whisksusers resource to create - param: namespace default to nuvolaris + param: namespace default to openserverless return: True if the operation is successfully, False otherwise """ - url = f"{self.host}/apis/nuvolaris.org/v1/namespaces/{namespace}/whisksusers" + url = f"{self.host}/apis/openserverless.org/v1/namespaces/{namespace}/whisksusers" headers = {"Authorization": self.token} try: @@ -141,14 +141,14 @@ class KubeApiClient: logging.error("create_whisk_user %s", ex) return False - def delete_whisk_user(self, username: str, namespace="nuvolaris"): + def delete_whisk_user(self, username: str, namespace="openserverless"): """ " Delete a whisk user using a DELETE operation param: username of the whisksusers resource to delete - param: namespace default to nuvolaris + param: namespace default to openserverless return: True if the operation is successfully, False otherwise """ - url = f"{self.host}/apis/nuvolaris.org/v1/namespaces/{namespace}/whisksusers/{username}" + url = f"{self.host}/apis/openserverless.org/v1/namespaces/{namespace}/whisksusers/{username}" headers = {"Authorization": self.token} try: @@ -170,14 +170,14 @@ class KubeApiClient: logging.error(f"delete_whisk_user {ex}") return False - def get_whisk_user(self, username: str, namespace="nuvolaris"): + def get_whisk_user(self, username: str, namespace="openserverless"): """ " Get a whisk user using a GET operation param: username of the whisksusers resource to delete - param: namespace default to nuvolaris + param: namespace default to openserverless return: a dictionary representing the existing user, None otherwise """ - url = f"{self.host}/apis/nuvolaris.org/v1/namespaces/{namespace}/whisksusers/{username}" + url = f"{self.host}/apis/openserverless.org/v1/namespaces/{namespace}/whisksusers/{username}" headers = {"Authorization": self.token} try: @@ -199,14 +199,14 @@ class KubeApiClient: logging.error(f"get_whisk_user {ex}") return None - def update_whisk_user(self, whisk_user_dict, namespace="nuvolaris"): + def update_whisk_user(self, whisk_user_dict, namespace="openserverless"): """ " Updates a whisk user using a PUT operation param: whisk_user_dict a dictionary representing the whisksusers resource to update - param: namespace default to nuvolaris + param: namespace default to openserverless return: True if the operation is successfully, False otherwise """ - url = f"{self.host}/apis/nuvolaris.org/v1/namespaces/{namespace}/whisksusers/{whisk_user_dict['metadata']['name']}" + url = f"{self.host}/apis/openserverless.org/v1/namespaces/{namespace}/whisksusers/{whisk_user_dict['metadata']['name']}" headers = {"Authorization": self.token} try: @@ -233,7 +233,7 @@ class KubeApiClient: logging.error(f"update_whisk_user {ex}") return False - def get_config_map(self, cm_name: str, namespace="nuvolaris"): + def get_config_map(self, cm_name: str, namespace="openserverless"): """ Get a ConfigMap by name. :param cm_name: Name of the ConfigMap. @@ -261,7 +261,7 @@ class KubeApiClient: logging.error(f"get_config_map {ex}") return None - def post_config_map(self, cm_name: str, file_or_dir: str, namespace="nuvolaris"): + def post_config_map(self, cm_name: str, file_or_dir: str, namespace="openserverless"): """ Create a ConfigMap from a file or directory. :param cm_name: Name of the ConfigMap. @@ -314,7 +314,7 @@ class KubeApiClient: logging.error(f"post_config_map {ex}") return None - def delete_config_map(self, cm_name: str, namespace="nuvolaris"): + def delete_config_map(self, cm_name: str, namespace="openserverless"): """ Delete a ConfigMap by name. :param cm_name: Name of the ConfigMap to delete. @@ -343,7 +343,7 @@ class KubeApiClient: logging.error(f"delete_config_map {ex}") return False - def get_secret(self, secret_name: str, namespace="nuvolaris"): + def get_secret(self, secret_name: str, namespace="openserverless"): """ Get a Kubernetes secret by name. :param secret_name: Name of the secret. @@ -371,7 +371,7 @@ class KubeApiClient: logging.error(f"get_secret {ex}") return None - def post_secret(self, secret_name: str, secret_data: dict, type: str="Opaque", namespace="nuvolaris"): + def post_secret(self, secret_name: str, secret_data: dict, type: str="Opaque", namespace="openserverless"): """ Create a Kubernetes secret. :param secret_name: Name of the secret. @@ -424,7 +424,7 @@ class KubeApiClient: logging.error(f"post_secret {ex}") return None - def delete_secret(self, secret_name: str, namespace="nuvolaris"): + def delete_secret(self, secret_name: str, namespace="openserverless"): """ Delete a Kubernetes secret. :param secret_name: Name of the secret to delete. @@ -452,7 +452,7 @@ class KubeApiClient: logging.error(f"delete_secret {ex}") return False - def get_jobs(self, name_filter: str | None = None, namespace="nuvolaris"): + def get_jobs(self, name_filter: str | None = None, namespace="openserverless"): """ Get all Kubernetes jobs in a specific namespace. :param name_filter: Optional filter to match job names. @@ -485,7 +485,7 @@ class KubeApiClient: logging.error(f"get_jobs {ex}") return None - def delete_job(self, job_name: str, namespace="nuvolaris"): + def delete_job(self, job_name: str, namespace="openserverless"): """ Delete a Kubernetes job by name. :param job_name: Name of the job to delete. @@ -513,7 +513,7 @@ class KubeApiClient: logging.error(f"delete_job {ex}") return False - def post_job(self, job_manifest: dict, namespace="nuvolaris"): + def post_job(self, job_manifest: dict, namespace="openserverless"): """ Create a Kubernetes job. :param job_manifest: Dictionary containing the job manifest. @@ -539,7 +539,7 @@ class KubeApiClient: logging.error(f"post_job {ex}") return None - def get_pod_by_job_name(self, job_name: str, namespace="nuvolaris"): + def get_pod_by_job_name(self, job_name: str, namespace="openserverless"): """ Get the pod name associated with a job by its name. :param job_name: Name of the job. @@ -570,7 +570,7 @@ class KubeApiClient: logging.error(f"get_pod_by_job_name {ex}") return None - def stream_pod_logs(self, pod_name: str, namespace="nuvolaris"): + def stream_pod_logs(self, pod_name: str, namespace="openserverless"): """ Stream logs from a specific pod. :param pod_name: Name of the pod to stream logs from. @@ -583,7 +583,7 @@ class KubeApiClient: if line: print(line.decode()) - def check_job_status(self, job_name: str, namespace="nuvolaris"): + def check_job_status(self, job_name: str, namespace="openserverless"): """ Check the status of a job by its name. :param job_name: Name of the job to check. @@ -604,7 +604,7 @@ class KubeApiClient: logging.error(f"check_job_status {ex}") return False - def get_pod(self, pod_name: str, namespace="nuvolaris"): + def get_pod(self, pod_name: str, namespace="openserverless"): """ Get pod details by name. :param pod_name: Name of the pod. @@ -632,7 +632,7 @@ class KubeApiClient: logging.error(f"get_pod {ex}") return None - def wait_for_init_container_completion(self, job_name: str, init_container_name: str, namespace="nuvolaris", timeout_seconds=300): + def wait_for_init_container_completion(self, job_name: str, init_container_name: str, namespace="openserverless", timeout_seconds=300): """ Wait for a specific init container in a job's pod to complete (successfully or with error). :param job_name: Name of the job. diff --git a/openserverless/common/validation.py b/openserverless/common/validation.py index f0a1655..dd8055b 100644 --- a/openserverless/common/validation.py +++ b/openserverless/common/validation.py @@ -20,7 +20,7 @@ import re def is_valid_username(username): """ - Verifies the given username follows nuvolaris rule + Verifies the given username follows openserverless rule >>> is_valid_username("bruno") True >>> is_valid_username("bruno123") diff --git a/openserverless/common/whisk_user_data.py b/openserverless/common/whisk_user_data.py index fe43416..f2ada68 100644 --- a/openserverless/common/whisk_user_data.py +++ b/openserverless/common/whisk_user_data.py @@ -117,9 +117,9 @@ class WhiskUserData: """ wsku = { - "apiVersion": "nuvolaris.org/v1", + "apiVersion": "openserverless.org/v1", "kind": "WhiskUser", - "metadata": {"name": self._data["username"], "namespace": "nuvolaris"}, + "metadata": {"name": self._data["username"], "namespace": "openserverless"}, "spec": { "email": self._data["email"], "password": self._data["password"], diff --git a/openserverless/common/whisk_user_generator.py b/openserverless/common/whisk_user_generator.py index 7514aef..3c62e00 100644 --- a/openserverless/common/whisk_user_generator.py +++ b/openserverless/common/whisk_user_generator.py @@ -55,9 +55,9 @@ def generate_whisk_user_yaml( """ return { - "apiVersion": "nuvolaris.org/v1", + "apiVersion": "openserverless.org/v1", "kind": "WhiskUser", - "metadata": {"name": username, "namespace": "nuvolaris"}, + "metadata": {"name": username, "namespace": "openserverless"}, "spec": { "email": email, "password": password, diff --git a/openserverless/couchdb/couchdb_util.py b/openserverless/couchdb/couchdb_util.py index 4a7ab1e..f7ff16a 100644 --- a/openserverless/couchdb/couchdb_util.py +++ b/openserverless/couchdb/couchdb_util.py @@ -24,7 +24,7 @@ class CouchDB: def __init__(self, environ=os.environ): self._environ = environ self.db_protocol = "http" - self.db_prefix = "nuvolaris_" + self.db_prefix = "openserverless_" self.db_port = environ.get("COUCHDB_SERVICE_PORT", "5984") self.db_host = environ.get("COUCHDB_SERVICE_HOST", "localhost") diff --git a/openserverless/impl/auth/auth_service.py b/openserverless/impl/auth/auth_service.py index d13fde7..6998c6e 100644 --- a/openserverless/impl/auth/auth_service.py +++ b/openserverless/impl/auth/auth_service.py @@ -74,7 +74,7 @@ class AuthService: def map_data(self, user_data): """ - Map the internal nuvolaris user_data records to the auth response + Map the internal openserverless user_data records to the auth response """ resp = {} resp["login"] = user_data["login"] diff --git a/openserverless/impl/builder/build_service.py b/openserverless/impl/builder/build_service.py index bf501c5..44dc85d 100644 --- a/openserverless/impl/builder/build_service.py +++ b/openserverless/impl/builder/build_service.py @@ -73,17 +73,17 @@ class BuildService: self.build_config = build_config - # install the nuvolaris-buildkitd-conf ConfigMap if not present - cm = self.kube_client.get_config_map("nuvolaris-buildkitd-conf") + # install the openserverless-buildkitd-conf ConfigMap if not present + cm = self.kube_client.get_config_map("openserverless-buildkitd-conf") if cm is None: - logging.info("Adding nuvolaris-buildkitd-conf ConfigMap") + logging.info("Adding openserverless-buildkitd-conf ConfigMap") status = self.kube_client.post_config_map( - cm_name="nuvolaris-buildkitd-conf", + cm_name="openserverless-buildkitd-conf", file_or_dir="deploy/buildkit/buildkitd.toml", - namespace="nuvolaris", + namespace="openserverless", ) if status is None: - logging.error("Failed to create nuvolaris-buildkitd-conf ConfigMap") + logging.error("Failed to create openserverless-buildkitd-conf ConfigMap") def create_registry_secret(self, username: str, password: str, registry: str): randompart = ''.join(random.choices(string.ascii_lowercase + string.digits, k=5)) @@ -114,7 +114,7 @@ class BuildService: return user_registry_host # Try to get from OpenServerless config map - registry_host = 'nuvolaris-registry-svc:5000' # Default fallback + registry_host = 'openserverless-registry-svc:5000' # Default fallback ops_config_map = self.kube_client.get_config_map('config') if ops_config_map is not None: if 'annotations' in ops_config_map.get('metadata', {}): @@ -300,7 +300,7 @@ class BuildService: init_container_completed = self.kube_client.wait_for_init_container_completion( job_name=self.job_name, init_container_name="copy-build-context", - namespace="nuvolaris", + namespace="openserverless", timeout_seconds=120 # 2 minutes should be enough for copying files ) @@ -419,8 +419,8 @@ class BuildService: "restartPolicy": "Never", "volumes": [ { - "name": "nuvolaris-buildkitd-conf", - "configMap": {"name": "nuvolaris-buildkitd-conf"}, + "name": "openserverless-buildkitd-conf", + "configMap": {"name": "openserverless-buildkitd-conf"}, }, { "name": "build-context-vol", @@ -477,7 +477,7 @@ class BuildService: { "name": "BUILDKIT_ROOTLESS", "value": "1" } ], "volumeMounts": [ - { "name": "nuvolaris-buildkitd-conf", "mountPath": "/config" }, + { "name": "openserverless-buildkitd-conf", "mountPath": "/config" }, { "name": "workspace", "mountPath": "/workspace" }, { "name": "docker-config", "mountPath": "/home/user/.docker" }, { "name": "img-cache", "mountPath": "/tmp" }, diff --git a/openserverless/impl/onboard/user_validation.py b/openserverless/impl/onboard/user_validation.py index 354c8b3..8005a7d 100644 --- a/openserverless/impl/onboard/user_validation.py +++ b/openserverless/impl/onboard/user_validation.py @@ -31,8 +31,8 @@ class UserValidation: def validate(self, namespace): """ - Action to be invoked to validate the username. It checks that it respects nuvolaris rules and - that there is no user on current nuvolaris setup with that namespace assigned. + Action to be invoked to validate the username. It checks that it respects openserverless rules and + that there is no user on current openserverless setup with that namespace assigned. """ try: diff --git a/openserverless/security/ow_authorize.py b/openserverless/security/ow_authorize.py index 616bc6d..17e37ec 100644 --- a/openserverless/security/ow_authorize.py +++ b/openserverless/security/ow_authorize.py @@ -28,7 +28,7 @@ def ow_authorize(pass_user_data=False, kwargs_field_name="ow-auth-user"): """ Decorator to be applied when a rest API endpoints must be validated against an OpenServerless OpenWhisk namespace credentials. - param: pass_user_data, set to true to pass the authenticated nuvolaris + param: pass_user_data, set to true to pass the authenticated openserverless namespace subject details into the wrapper function into the **kwargs dictionary param: kwargs_field_name, pass here the custom element name for the subject
