Merge pull request #22 from francescotimperi/main

gh action includes test and uses kind 1.25.3 for testing purposes

Author: Francesco Timperi Tiberi

.github/workflows/check.yml

@@ -31,12 +31,13 @@
 name: openserverless-operator-check
 on: 
   push:
-    tags-ignore:
-       - '*'
+    branches: [main]
+  pull_request:
+    branches: [main]
 
 jobs:
   check:
-    name: Build
+    name: Check OpenServerless Operator
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -46,29 +47,32 @@ jobs:
       - name: License   
         uses: apache/skywalking-eyes@main
         continue-on-error: true
-      - name: Make envfile
-        if:  ${{ env.GITHUB_USER != 'nuvolaris'}}
-        uses: SpicyPizza/[email protected]
-        with:
-          envkey_MY_OPERATOR_IMAGE: ${{ secrets.MY_OPERATOR_IMAGE }}
-          file_name: .env
-          fail_on_empty: false        
+      - name: Assign TAG from pull request
+        if:  ${{ github.event_name == 'pull_request' }}
+        run: |
+          echo "IMG_TAG=$(git rev-parse --short HEAD)" >> "$GITHUB_ENV"
+      - name: Assign TAG from push
+        if:  ${{ github.event_name != 'pull_request' }}
+        run: |
+          echo "IMG_TAG=$(git describe --tags --abbrev=0)" >> "$GITHUB_ENV"        
+      - name: Assign Custom Image Name
+        if:  ${{ github.repository_owner != 'apache'}}
+        run: |
+          echo "MY_OPERATOR_IMAGE=${{ vars.MY_OPERATOR_IMAGE }}" >> "$GITHUB_ENV"       
       - name: Kind
-        uses: helm/kind-action@v1.2.0
+        uses: container-tools/kind-action@v2.0.4
         with:
-          cluster_name: nuvolaris
-          config: .github/kind.yaml
+              version: v0.17.0
+              cluster_name: nuvolaris
+              config: .github/kind.yaml 
       - name: Setup
         run: bash .github/cisetup.sh
       - name: Install
         run: task setup
       - name: BuildAndLoad
-        run: task build-and-load
+        run: task build-and-load TAG="$IMG_TAG"
       - name: AddIngress
-        run: task kind:ingress        
-      - name: Test
-        run: task test
-        continue-on-error: true
+        run: task kind:ingress
       - name: Ngrok
         if: ${{ env.NGROK == 'on' }}
         run: bash .github/debug-github-actions.sh
@@ -77,4 +81,10 @@ jobs:
           USER_PASS: ${{ secrets.USER_PASS }}
       - name: Wait
         if: ${{ env.NGROK == 'on' }}
-        run: bash .github/wait.sh
+        run: bash .github/wait.sh               
+      - name: Unit Test
+        run: task utest
+        continue-on-error: false
+      - name: Integration Test
+        run: task itest
+        continue-on-error: false        

.github/workflows/image.yml

@@ -29,20 +29,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Build Openserverless-operator Image
+name: Build OpenServerless Operator
 
 on:
   push:
     tags:
     - '[0-9]*'
     branches-ignore:
     - '*'
-  pull_request:
-    branches: [main]    
-
 jobs:
   image:
-    name: Image
+    name: Build OpenServerless Operator Image
     runs-on: ubuntu-latest
     steps:
       - name: Remove unnecessary files
@@ -69,8 +66,33 @@ jobs:
           echo "MY_OPERATOR_IMAGE=${{ vars.MY_OPERATOR_IMAGE }}" >> "$GITHUB_ENV"
       - name: Setup
         run: bash .github/cisetup.sh
+      - name: Kind
+        uses: container-tools/[email protected]
+        with:
+            version: v0.17.0
+            cluster_name: nuvolaris
+            config: .github/kind.yaml        
       - name: Install
         run: poetry install
+      - name: BuildAndLoad
+        run: task build-and-load TAG="$IMG_TAG"
+      - name: Ngrok
+        if: ${{ env.NGROK == 'on' }}
+        run: bash .github/debug-github-actions.sh
+        env:
+          NGROK_TOKEN: ${{ secrets.NGROK_TOKEN }}
+          USER_PASS: ${{ secrets.USER_PASS }}
+      - name: Wait
+        if: ${{ env.NGROK == 'on' }}
+        run: bash .github/wait.sh
+      - name: AddIngress
+        run: task kind:ingress         
+      - name: Unit Test
+        run: task utest
+        continue-on-error: false
+      - name: Integration Test
+        run: task itest
+        continue-on-error: false        
       - name: Registry login
         uses: docker/login-action@v3
         with:
@@ -82,4 +104,4 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Image
-        run: task buildx-and-push TAG="$IMG_TAG"      
+        run: task buildx-and-push TAG="$IMG_TAG"     

Taskfile.yml

@@ -22,7 +22,7 @@ vars:
   N: ""
   T: ""
   P: ""
-  BASETAG: 0.1.0-testing
+  BASETAG: 0.1.0-incubating
   KUBE:
     sh: ./detect.sh
   NS: "nuvolaris"
@@ -185,6 +185,7 @@ tasks:
 
   # update configuration files from openwhisk source
   update-files-from-openwhisk: 
+    ignore_error: true
     cmds:
       - | 
         cp -v ../nuvolaris/nuvolaris-controller/openwhisk/ansible/files/*.json nuvolaris/files
@@ -236,7 +237,7 @@ tasks:
 
   iclean: rm -f deploy/*/kustomization.yaml deploy/*/__* deploy/*/*_generated.yaml
 
-  itest: 
+  itest:
     cmds:
       - task: iclean
       - |
@@ -272,7 +273,6 @@ tasks:
     - task: t:hello
     - task: t:redis
     - task: t:echo
-    - task: t:api
 
   test:
     - task: clean

nuvolaris/ip_util.py

@@ -28,10 +28,9 @@ class IpUtil:
     _machine_ip = None
 
     def __init__(self):
-        self.IPIFY_API_URI = 'https://api.ipify.org'
-        self.IFCONFIG_API_URI = 'https://ifconfig.me/ip'     
+        self.IPIFY_API_URI = 'https://api.ipify.org'  
         self.IP_INFO_API_URI = 'https://ipinfo.io/ip'
-        self.IDENT_ME_API_URI = 'https://ident.me/'
+        self.IDENT_ME_API_URI = 'https://4.ident.me/'
         self.USER_AGENT = 'nuvolaris-ip-resolver'
         # The maximum amount of tries to attempt when making API calls.
         self.MAX_TRIES = 3
@@ -53,17 +52,14 @@ def _get_ip_resp(self,api_uri: str):
         logging.debug(f"querying ip from {api_uri}")
         return get(api_uri, headers={'user-agent': self.USER_AGENT})
 
-    def handle_ip_request(self,url):
+    def handle_ip_request(self,url, extra=None):
         """
-        Query a public api retuning the machine's public ip address
+        Query a public api returning the machine's public ip address
         >>> from nuvolaris.ip_util import IpUtil
         >>> ip_util = IpUtil()
         >>> ipify_ip = ip_util.handle_ip_request('https://api.ipify.org')
-        >>> ifconfig_ip = ip_util.handle_ip_request('https://ifconfig.me/ip')
         >>> ifinfo_ip = ip_util.handle_ip_request('https://ipinfo.io/ip')
-        >>> identme_ip = ip_util.handle_ip_request('https://ident.me/')
-        >>> ipify_ip == ifconfig_ip
-        True
+        >>> identme_ip = ip_util.handle_ip_request('https://4.ident.me/')
         >>> ipify_ip == ifinfo_ip
         True
         >>> ipify_ip == identme_ip
@@ -100,7 +96,6 @@ def get_public_ip(self):
         True
        """
        self.get_ip_chain(self.IPIFY_API_URI)
-       self.get_ip_chain(self.IFCONFIG_API_URI)
        self.get_ip_chain(self.IP_INFO_API_URI)
        self.get_ip_chain(self.IDENT_ME_API_URI)
 

nuvolaris/minio_deploy.py

@@ -106,7 +106,7 @@ def _annotate_nuv_metadata(data):
             openwhisk.annotate(f"s3_host={minio_host}")
             openwhisk.annotate(f"s3_access_key={access_key}")
             openwhisk.annotate(f"s3_secret_key={secret_key}")
-            openwhisk.annotate(f"s3_provider=minio")
+            openwhisk.annotate("s3_provider=minio")
 
             ports = list(minio_service['spec']['ports'])
             for port in ports:

nuvolaris/testutil.py

@@ -182,7 +182,14 @@ def load_image_env():
     r = run('grep MY_OPERATOR_IMAGE .env', shell=True, capture_output=True)
     if r.returncode == 0:
         opimg = r.stdout.strip().decode("ascii").split("=")[-1]
-    os.environ["OPERATOR_IMAGE"] = opimg
+    g = run('grep GITHUB_USER= .env', shell=True, capture_output=True)
+    if g.returncode == 0 and opimg:
+        ghuser = g.stdout.strip().decode("ascii").split("=")[-1]
+        opimg = opimg.replace("${GITHUB_USER}",ghuser)
+
+    # gives precedence to env variable if set
+    os.environ["OPERATOR_IMAGE"] = os.getenv("MY_OPERATOR_IMAGE", opimg)
+
     # operator tag is the git tag of the operator
     r = run('git describe --tags --abbrev=0 2>/dev/null || git rev-parse --short HEAD', shell=True, capture_output=True)
     tag = r.stdout.strip().decode("ascii")

nuvolaris/util.py

@@ -349,7 +349,7 @@ def get_minio_config_data():
         "applypodsecurity":get_enable_pod_security(),
         "name":"minio-deployment",
         "container":"minio",
-        "minio_host": cfg.get('minio.host') or "minio",
+        "minio_host": cfg.get('minio.host') or 'minio',
         "minio_volume_size": cfg.get('minio.volume-size') or "5",
         "minio_root_user": cfg.get('minio.admin.user') or "minio",
         "minio_root_password": cfg.get('minio.admin.password') or "minio123",

tests/couchdb_test.ipy

@@ -30,5 +30,5 @@ cfg.detect()
 cdb.create(None)
 r = !kubectl -n nuvolaris wait --for=condition=complete job/couchdb-init --timeout=600s
 assert(r[0].find("condition met") != -1)
-r = !kubectl -n nuvolaris logs -l job=couchdb-init | grep "OK: add_subjects"
+r = !kubectl -n nuvolaris logs -l job=couchdb-init | grep "OK: enable_db_compaction: subjects"
 assert(r[0].find("OK:") != -1)

tests/kind/minio_static_test.ipy

@@ -22,7 +22,7 @@ import nuvolaris.config as cfg
 import nuvolaris.testutil as tu
 import nuvolaris.minio_deploy as minio
 import nuvolaris.util as util
-import nuvolaris.minio_static as nginx
+import nuvolaris.storage_static as static
 import logging
 import os
 
@@ -34,7 +34,7 @@ assert(cfg.detect_storage()["nuvolaris.storageclass"])
 os.environ['MINIO_API_HOST']='localhost'
 
 assert(minio.create())
-assert(nginx.create())
+assert(static.create())
 
-assert(nginx.delete())
+assert(static.delete())
 assert(minio.delete())