Merge branch 'main' of https://github.com/drycc/stacks

Author: zhangeamon

.woodpecker/build.yml

@@ -12,12 +12,17 @@ steps:
   image: bash
   commands:
   - ./build.sh all $CI_COMMIT_TAG
-  secrets:
-  - codename
-  - oss_endpoint
-  - oss_access_key_id
-  - oss_access_key_secret
-  - container_pull_secrets
+  environment:
+    CODENAME:
+      from_secret: codename
+    OSS_ENDPOINT:
+      from_secret: oss_endpoint
+    OSS_ACCESS_KEY_ID:
+      from_secret: oss_access_key_id
+    OSS_ACCESS_KEY_SECRET:
+      from_secret: oss_access_key_secret
+    CONTAINER_PULL_SECRETS:
+      from_secret: container_pull_secrets
   when:
     event:
     - tag

.woodpecker/check.yml

@@ -14,10 +14,13 @@ steps:
       -w "$(pwd)"
       registry.drycc.cc/drycc/python-dev
       python scripts/checker.py
-  secrets:
-  - github_token
-  - dev_registry
-  - drycc_registry
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+    DEV_REGISTRY:
+      from_secret: dev_registry
+    DRYCC_REGISTRY:
+      from_secret: drycc_registry
   when:
     event:
     - cron

scripts/checker.py

@@ -2,11 +2,30 @@
 import re
 import json
 import requests
-from datetime import datetime
+from datetime import datetime, timezone
+
 
 github_headers = {'Authorization': 'token %s' % os.environ.get("GITHUB_TOKEN")}
 
 repo_info_table = {
+    "apollo-adminservice": {
+        "name": "apollo",
+        "type": "github",
+        "owner": "apolloconfig",
+        "match": "^v[1-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
+    },
+    "apollo-configservice": {
+        "name": "apollo",
+        "type": "github",
+        "owner": "apolloconfig",
+        "match": "^v[1-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
+    },
+    "apollo-portal": {
+        "name": "apollo",
+        "type": "github",
+        "owner": "apolloconfig",
+        "match": "^v[1-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
+    },
     "alertmanager": {
         "name": "alertmanager",
         "type": "github",
@@ -67,6 +86,12 @@
         "owner": "erlang",
         "match": "^OTP-[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
     },
+    "etcd": {
+        "name": "etcd",
+        "type": "github",
+        "owner": "etcd-io",
+        "match": "^v[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
+    },
     "fluentd": {
         "name": "fluentd",
         "type": "github",
@@ -127,6 +152,18 @@
         "owner": "stedolan",
         "match": "^jq-[0-9]{1,}\.[0-9]{1,}\.?[0-9]{0}$",
     },
+    "kvrocks": {
+        "name": "kvrocks",
+        "type": "github",
+        "owner": "apache",
+        "match": "^v[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
+    },
+    "kvrocks_exporter": {
+        "name": "kvrocks_exporter",
+        "type": "github",
+        "owner": "RocksLabs",
+        "match": "^v[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
+    },
     "kubectl": {
         "name": "kubectl",
         "type": "github",
@@ -211,8 +248,14 @@
         "owner": "redis",
         "match": "^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
     },
-    "redis-cluster-proxy": {
-        "name": "redis-cluster-proxy",
+    "valkey": {
+        "name": "valkey",
+        "type": "github",
+        "owner": "valkey-io",
+        "match": "^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
+    },
+    "valkey-sentinel-proxy": {
+        "name": "valkey-sentinel-proxy",
         "type": "github",
         "owner": "drycc-addons",
         "match": "^v[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$",
@@ -484,7 +527,8 @@ def check_github_version(stack):
     for tag in response.json()["data"]["repository"]["refs"]["edges"]:
         if "tagger" in tag["node"]["target"]:
             date = datetime.strptime(
-                tag["node"]["target"]["tagger"]["date"][:19], "%Y-%m-%dT%H:%M:%S")
+                tag["node"]["target"]["tagger"]["date"][:19], "%Y-%m-%dT%H:%M:%S"
+            ).astimezone(timezone.utc)
         else:
             date = datetime.strptime(
                 requests.get(
@@ -493,9 +537,9 @@ def check_github_version(stack):
                     ), headers=github_headers
                 ).json()["commit"]["author"]["date"][:19],
                 "%Y-%m-%dT%H:%M:%S"
-            )
+            ).astimezone(timezone.utc)
         if re.match(info["match"], tag["node"]["name"]):
-            if (datetime.utcnow() - date).days <= 7:
+            if (datetime.now(timezone.utc) - date).days <= 7:
                 create_github_issue(stack, tag["node"]["name"])
             else:
                 break
@@ -528,3 +572,4 @@ def main():
 
 if __name__ == "__main__":
    main()
+

scripts/stack-utils

@@ -5,8 +5,9 @@ shopt -s expand_aliases
 alias gzip="gzip -n -9"
 
 . /etc/os-release
-export GO_VERSION=1.22
+export GO_VERSION=1.23
 export RUBY_VERSION=3.3
+export RUST_VERSION=1
 export STACK_NAME="${STACK_NAME:?name is required}"
 export STACK_VERSION="${STACK_VERSION:?version is required}"
 export OS_NAME="${OS_NAME:-linux}"

scripts/storage.py

@@ -14,12 +14,12 @@
 )
 
 symlink_table = {
-    "go": ["1.16", "1.17", "1.18", "1.19", "1.20", "1.21", "1.22"],
-    "java": ["8", "11", "17", "18", "19", "20", "21", "22"],
-    "node": ["12", "14", "16", "17", "18", "19", "20", "21"],
-    "php": ["7.3", "7.4", "8.0", "8.1", "8.2", "8.3"],
-    "python": ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
-    "ruby": ["2.6", "3.7", "3.0", "3.1", "3.2", "3.3"],
+    "go": ["1.16", "1.17", "1.18", "1.19", "1.20", "1.21", "1.22", "1.23"],
+    "java": ["8", "11", "17", "18", "19", "20", "21", "22", "23", "24"],
+    "node": ["12", "14", "16", "17", "18", "19", "20", "21", "22", "23"],
+    "php": ["7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"],
+    "python": ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
+    "ruby": ["2.6", "3.7", "3.0", "3.1", "3.2", "3.3", "3.4"],
     "rust": ["1"],
 }
 
@@ -44,6 +44,12 @@ def upload_list(stack_name, dist_dir):
                             symlink(stack_name, symlink_version)
 
 
+def repair_symlink():
+    for stack_name, versions in symlink_table.items():
+        for version in versions:
+            symlink(stack_name, version)
+
+
 def symlink(stack_name, version):
     symlink_list = []
     object_list = [
@@ -63,6 +69,8 @@ def symlink(stack_name, version):
     action = sys.argv[1]
     if action == "upload":
         upload_list(sys.argv[2], sys.argv[3])
+    elif action == "repair":
+        repair_symlink()
     elif action == "symlink":
         symlink(sys.argv[2], sys.argv[3])
     else:

stacks/apollo-adminservice/build.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Load stack utils
+. /usr/bin/stack-utils
+
+# Implement build function
+function build() {
+  generate-stack-path
+  
+  curl -fsSL -o tmp.zip https://github.com/apolloconfig/apollo/releases/download/v${STACK_VERSION}/apollo-adminservice-${STACK_VERSION}-github.zip
+  unzip tmp.zip -d "${DATA_DIR}"
+  rm tmp.zip -rf
+}
+
+# call build stack
+build-stack "${1}"

stacks/apollo-configservice/build.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Load stack utils
+. /usr/bin/stack-utils
+
+# Implement build function
+function build() {
+  generate-stack-path
+  
+  curl -fsSL -o tmp.zip https://github.com/apolloconfig/apollo/releases/download/v${STACK_VERSION}/apollo-configservice-${STACK_VERSION}-github.zip
+  unzip tmp.zip -d "${DATA_DIR}"
+  rm tmp.zip -rf
+}
+
+# call build stack
+build-stack "${1}"

stacks/apollo-portal/build.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Load stack utils
+. /usr/bin/stack-utils
+
+# Implement build function
+function build() {
+  generate-stack-path
+  
+  curl -fsSL -o tmp.zip https://github.com/apolloconfig/apollo/releases/download/v${STACK_VERSION}/apollo-portal-${STACK_VERSION}-github.zip
+  unzip tmp.zip -d "${DATA_DIR}"
+  rm tmp.zip -rf
+}
+
+# call build stack
+build-stack "${1}"

stacks/etcd/build.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Load stack utils
+. /usr/bin/stack-utils
+
+# Implement build function
+function build() {
+  generate-stack-path
+  architecture=$(dpkg --print-architecture)
+  package="etcd-v${STACK_VERSION}-linux-${architecture}"
+
+  BIN_DIR="${DATA_DIR}"/bin
+  mkdir -p "${BIN_DIR}"
+
+  curl -sSL https://github.com/etcd-io/etcd/releases/download/v${STACK_VERSION}/${package}.tar.gz | tar xvz
+  cp ${package}/etcd ${package}/etcdctl $BIN_DIR
+  rm -rf ${package}
+  chmod +x "${BIN_DIR}"/*
+}
+
+# call build stack
+build-stack "${1}"

stacks/kvrocks/build.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Load stack utils
+. /usr/bin/stack-utils
+
+# Implement build function
+function build() {
+  generate-stack-path
+  architecture=$(dpkg --print-architecture)
+  package="etcd-v${STACK_VERSION}-linux-${architecture}"
+
+  BIN_DIR="${DATA_DIR}"/bin
+  ETC_DIR="${DATA_DIR}"/etc
+  DEFAULT_ETC_DIR="${DATA_DIR}"/etc.default
+  mkdir -p "${BIN_DIR}" "${ETC_DIR}" "${DEFAULT_ETC_DIR}"
+  # build kvrocks
+  curl -sSL https://github.com/apache/kvrocks/archive/refs/tags/v${STACK_VERSION}.tar.gz | tar xvz
+  cd kvrocks-${STACK_VERSION}
+  apt install -y git build-essential cmake libtool python3 libssl-dev
+  ./x.py build -DENABLE_OPENSSL=ON -DPORTABLE=1 -DCMAKE_BUILD_TYPE=Release; cd ..
+  # build kvrocks controller
+  install-stack go "${GO_VERSION}" && . init-stack
+  KVROCKS_CONTROLLER_GIT_URL=https://github.com/apache/kvrocks-controller
+  # KVROCKS_CONTROLLER_VERSION=$(curl -Ls $KVROCKS_CONTROLLER_GIT_URL/tags|grep apache/kvrocks-controller/releases/tag/ | sed -E 's/.*\/apache\/kvrocks-controller\/releases\/tag\/v([0-9\.]{1,}(-rc.[0-9]{1,})?)".*/\1/g' | head -1)
+  KVROCKS_CONTROLLER_VERSION=unstable
+  git clone --dept 1 -b ${KVROCKS_CONTROLLER_VERSION} https://github.com/apache/kvrocks-controller
+  cd kvrocks-controller
+  make; cd ..
+  
+  # cp kvrocks
+  cp kvrocks-${STACK_VERSION}/build/{kvrocks,kvrocks2redis} $BIN_DIR
+  cp kvrocks-${STACK_VERSION}/kvrocks.conf "${DEFAULT_ETC_DIR}"
+  # cp kvrocks controller
+  cp kvrocks-controller/_build/* $BIN_DIR
+  cp kvrocks-controller/config/config.yaml "${DEFAULT_ETC_DIR}"/kvrocks-controller.yaml
+
+  # clean
+  rm -rf kvrocks-controller kvrocks-${STACK_VERSION}
+
+  chmod +x "${BIN_DIR}"/*
+
+  # upx
+  upx --lzma --best "${BIN_DIR}"/*
+}
+
+# call build stack
+build-stack "${1}"