You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openserverless.apache.org by ms...@apache.org on 2024/07/11 10:30:10 UTC
(openserverless) branch main updated: fixed submodules (#14)
This is an automated email from the ASF dual-hosted git repository.
msciabarra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openserverless.git
The following commit(s) were added to refs/heads/main by this push:
new 8735443 fixed submodules (#14)
8735443 is described below
commit 8735443fe1ac5f1f84769dccff90139339a257a5
Author: Mirella Di Girolamo <12...@users.noreply.github.com>
AuthorDate: Thu Jul 11 12:30:06 2024 +0200
fixed submodules (#14)
* moved references
* Update README.md
* updating cloud-init
* use https: url and specify branch
* use apache repo
---
.attic/setup-k3s-wsl.txt | 33 ---------------------------------
.gitignore | 1 +
.gitmodules | 13 ++++++-------
README.md | 6 ++++--
aliases | 2 +-
cli | 2 +-
cloud-init.yaml | 30 ++++++++++++++++++++++++------
operator | 2 +-
site | 2 +-
9 files changed, 39 insertions(+), 52 deletions(-)
diff --git a/.attic/setup-k3s-wsl.txt b/.attic/setup-k3s-wsl.txt
deleted file mode 100644
index 5d66680..0000000
--- a/.attic/setup-k3s-wsl.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Archived as k3s is not ready and usable
-
-### Setup a development VM in Windows 11 using WSL2
-
-If you have Windows 11, open Powershell as an administrator then install and update WSL2
-
-```
-wsl --install
-wsl --update
-wsl --set-default-version 2
-wsl --install -no-launch -d Ubuntu-24.04
-```
-
-Then reboot your machine.
-
-If you have an older version of Windows, [check here](https://learn.microsoft.com/en-us/windows/wsl/install-manual)
-
-Now open again Powerlshell, as a normal user and prepare a data source for cloud init:
-
-```
-cd $env:USERPROFILE
-mkdir .cloud-init
-curl https://raw.githubusercontent.com/nuvolaris/openserverless/main/cloud-init.yaml -OutFile .\.cloud-init\Ubuntu-24.04.user-data
-```
-
-You are now ready to create your environment with
-
-```
-ubuntu2404.exe install --root
-ubuntu2404.exe run cloud-init status --wait
-```
-
-You will see a sequence of dots. Wait until you see `status: done`.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6bb34a4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.attic/
diff --git a/.gitmodules b/.gitmodules
index b3b6fff..7abccf3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,13 +1,12 @@
-[submodule "website"]
- path = website
- url = https://github.com/nuvolaris/openserverless-documentation
- branch = main
[submodule "site"]
path = site
- url = ssh://git@github.com/apache/openserverless-site
+ url = https://github.com/apache/openserverless-site
+ branch = main
[submodule "cli"]
path = cli
- url = ssh://git@github.com/apache/openserverless-cli
+ url = https://github.com/apache/openserverless-cli
+ branch = main
[submodule "operator"]
path = operator
- url = ssh://git@github.com/apache/openserverless-operator
+ url = https://github.com/apache/openserverless-operator
+ branch = main
diff --git a/README.md b/README.md
index e7b3e1b..534c266 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
# Apache OpenServerless
-Welcome to [Apache OpenServerless](https://cwiki.apache.org/confluence/display/INCUBATOR/OpenServerlessProposal) (also referenced as **AOS**), an incubating project at the [Apache Software Foundation](https://www.apache.org).
+Welcome to [Apache OpenServerless](https://cwiki.apache.org/confluence/display/INCUBATOR/OpenServerlessProposal) (shortened as **AOS**), an incubating project at the [Apache Software Foundation](https://www.apache.org).
+
+**NOTE** we are still in the process of migrating from [Nuvolaris](https://github.com/nuvolaris/nuvlaris) to Apache OpenServerless - check https://github.com/apache/openserverless/issues/2 for the status.
This README provides information how to setup the development environment of the project.
@@ -116,7 +118,7 @@ Host openserverless
IdentityFile ~/.ssh/id_rsa
```
-In alternative, you can use this all-in-one command:
+If you are Linux or Mac, you can use this all-in-one command:
```
export OS_IP=`multipass list | grep openserverless | grep Running | awk '{ print $3 }'`
diff --git a/aliases b/aliases
index 729b526..5549d90 100644
--- a/aliases
+++ b/aliases
@@ -59,7 +59,7 @@ export KNS="default"
alias k='kubectl -n $KNS'
alias kg='kubectl -n $KNS get'
alias kgy='kubectl -n $KNS -o yaml get'
-alias kap='kubectl -n $KNS apply -f'
+alias kaf='kubectl -n $KNS apply -f'
alias kde='kubectl -n $KNS describe'
alias kdel='kubectl -n $KNS delete'
alias kin="kubectl cluster-info"
diff --git a/cli b/cli
index 162edd0..6de5d29 160000
--- a/cli
+++ b/cli
@@ -1 +1 @@
-Subproject commit 162edd091b0c48f3e580b3329dd24c48486e1159
+Subproject commit 6de5d299750a8c4d636808017992ea0549e48c5a
diff --git a/cloud-init.yaml b/cloud-init.yaml
index 73c03e4..c5899a2 100644
--- a/cloud-init.yaml
+++ b/cloud-init.yaml
@@ -1,17 +1,32 @@
#cloud-config
apt_update: true
apt_upgrade: true
+users:
+ - name: ubuntu
+ uid: 1000
+ groups: sudo
+ shell: /bin/bash
+ sudo: ['ALL=(ALL) NOPASSWD:ALL']
runcmd:
- |
# install k3s, direnv, task
curl -sfL https://get.k3s.io | sh -
curl -sfL https://direnv.net/install.sh | bash
snap install task --classic
- echo "OPS_CLOUD_INIT_VER=1" >>/etc/environment
+ cd /tmp
+ curl https://dlcdn.apache.org/skywalking/eyes/0.6.0/skywalking-license-eye-0.6.0-bin.tgz | tar xzvf -
+ mv skywalking-license-eye-0.6.0-bin/bin/linux/license-eye /usr/bin/license-eye
+ rm -Rvf skywalking-license-eye-0.6.0-bin
+ echo "OPS_CLOUD_INIT_VER=2" >>/etc/environment
- |
# set home and user
USR="$(getent passwd 1000 | awk -F: '{print $1}')"
HOME="/home/$USR"
+ # copy authkey if there is a root one
+ if test -e /root/.ssh/authorized_keys
+ then mkdir -p /home/$USR/.ssh
+ cat /root/.ssh/authorized_keys >>/home/$USR/.ssh/authorized_keys
+ fi
# access k3s
mkdir -p "$HOME/.kube"
cp /etc/rancher/k3s/k3s.yaml "$HOME/.kube/config"
@@ -22,15 +37,18 @@ runcmd:
curl -L https://nixos.org/nix/install | sudo -u "$USR" sh -s -- --no-daemon
# get openserverless sources
cd $HOME
- git clone https://github.com/nuvolaris/openserverless --recurse-submodules
- cd $HOME/openserverless ; chmod +x sync-branch.sh ; ./sync-branch.sh
# add aliases
echo "source $HOME/openserverless/aliases" >>$HOME/.bashrc
# change owner to everything
chown -Rvf "$USR" "$HOME"
# allow direnv for submodules
+ sudo -u $USR git clone https://github.com/apache/openserverless --recurse-submodules
+ cd $HOME/openserverless
+ sudo -u $USR bash sync-branch.sh
+ sudo -u $USR direnv allow $HOME/openserverless/site
sudo -u $USR direnv allow $HOME/openserverless/cli
sudo -u $USR direnv allow $HOME/openserverless/operator
- sudo -u $USR direnv allow $HOME/openserverless/site
-
-
+ # install license-eye and a git-hook
+ sudo -u $USR git config core.hooksPath .git-hooks
+
+
diff --git a/operator b/operator
index c08ad7f..bbac78e 160000
--- a/operator
+++ b/operator
@@ -1 +1 @@
-Subproject commit c08ad7f49ed612486722f644e0be3b0025bdb8b9
+Subproject commit bbac78e8c03f2f7c514a8d6b3469301232caf533
diff --git a/site b/site
index 3af4165..078e034 160000
--- a/site
+++ b/site
@@ -1 +1 @@
-Subproject commit 3af41659124490d04105d8e7a56eea07ccf786b8
+Subproject commit 078e0341d390223ba981f2926424302d077b10e7