feat: add pluginImageRegistry and pluginImageNamespace config for built-in plugins (higress-group#666)

Author: johnlanni

backend/sdk/src/main/java/com/alibaba/higress/sdk/model/wasmplugin/WasmPluginServiceConfig.java

@@ -23,6 +23,10 @@
 public class WasmPluginServiceConfig {
     private static final String CUSTOM_IMAGE_URL_PATTERN_ENV = "HIGRESS_ADMIN_WASM_PLUGIN_CUSTOM_IMAGE_URL_PATTERN";
     private static final String CUSTOM_IMAGE_URL_PATTERN_PROPERTY = "higress-admin.wasmplugin.custom-image-url-pattern";
+    private static final String PLUGIN_IMAGE_REGISTRY_ENV = "HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_REGISTRY";
+    private static final String PLUGIN_IMAGE_REGISTRY_PROPERTY = "higress-admin.wasmplugin.plugin-image-registry";
+    private static final String PLUGIN_IMAGE_NAMESPACE_ENV = "HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_NAMESPACE";
+    private static final String PLUGIN_IMAGE_NAMESPACE_PROPERTY = "higress-admin.wasmplugin.plugin-image-namespace";
     private static final String CUSTOM_IMAGE_PULL_SECRET_ENV = "HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_PULL_SECRET";
     private static final String CUSTOM_IMAGE_PULL_POLICY_ENV = "HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_PULL_POLICY";
     private static final String CUSTOM_IMAGE_PULL_SECRET_PROPERTY = "higress-admin.wasmplugin.custom-image-pull-secret";
@@ -32,6 +36,10 @@ public static WasmPluginServiceConfig buildFromEnv() {
         WasmPluginServiceConfig result = new WasmPluginServiceConfig();
         result.customImageUrlPattern =
             EnvReadUtil.loadCustomConfFromEnv(CUSTOM_IMAGE_URL_PATTERN_PROPERTY, CUSTOM_IMAGE_URL_PATTERN_ENV);
+        result.pluginImageRegistry =
+            EnvReadUtil.loadCustomConfFromEnv(PLUGIN_IMAGE_REGISTRY_PROPERTY, PLUGIN_IMAGE_REGISTRY_ENV);
+        result.pluginImageNamespace =
+            EnvReadUtil.loadCustomConfFromEnv(PLUGIN_IMAGE_NAMESPACE_PROPERTY, PLUGIN_IMAGE_NAMESPACE_ENV);
         result.imagePullSecret =
             EnvReadUtil.loadCustomConfFromEnv(CUSTOM_IMAGE_PULL_SECRET_PROPERTY, CUSTOM_IMAGE_PULL_SECRET_ENV);
         result.imagePullPolicy =
@@ -40,6 +48,8 @@ public static WasmPluginServiceConfig buildFromEnv() {
     }
 
     private String customImageUrlPattern;
+    private String pluginImageRegistry;
+    private String pluginImageNamespace;
     private String imagePullSecret;
     private String imagePullPolicy;
 }

backend/sdk/src/main/java/com/alibaba/higress/sdk/service/WasmPluginServiceImpl.java

@@ -96,6 +96,9 @@ class WasmPluginServiceImpl implements WasmPluginService {
 
     private static final String NAME_PLACEHOLDER = "${name}";
     private static final String VERSION_PLACEHOLDER = "${version}";
+    private static final String OCI_PROTOCOL = "oci://";
+    private static final String DEFAULT_IMAGE_REGISTRY = "higress-registry.cn-hangzhou.cr.aliyuncs.com";
+    private static final String DEFAULT_IMAGE_NAMESPACE = "plugins";
 
     private volatile List<PluginCacheItem> builtInPlugins = Collections.emptyList();
 
@@ -125,6 +128,8 @@ public void initialize() {
         final List<PluginCacheItem> plugins = new ArrayList<>(properties.size());
 
         final String customImageUrlPattern = wasmPluginServiceConfig.getCustomImageUrlPattern();
+        final String pluginImageRegistry = wasmPluginServiceConfig.getPluginImageRegistry();
+        final String pluginImageNamespace = wasmPluginServiceConfig.getPluginImageNamespace();
         final String imagePullSecret = wasmPluginServiceConfig.getImagePullSecret();
         final String imagePullPolicy = wasmPluginServiceConfig.getImagePullPolicy();
 
@@ -152,8 +157,8 @@ public void initialize() {
                     ex);
             }
 
-            cacheItem.imageUrl = StringUtils.isBlank(customImageUrlPattern) ? imageUrl
-                : formatImageUrl(customImageUrlPattern, cacheItem.plugin.getInfo());
+            cacheItem.imageUrl = buildPluginImageUrl(imageUrl, customImageUrlPattern, pluginImageRegistry,
+                pluginImageNamespace, cacheItem.plugin.getInfo());
             cacheItem.imagePullSecret = imagePullSecret;
             cacheItem.imagePullPolicy = imagePullPolicy;
 
@@ -185,6 +190,46 @@ private static String formatImageUrl(String pattern, PluginInfo pluginInfo) {
             .replace(VERSION_PLACEHOLDER, pluginInfo.getVersion());
     }
 
+    private static String buildPluginImageUrl(String defaultUrl, String customPattern, String registry,
+        String namespace, PluginInfo pluginInfo) {
+        // Priority: customPattern > registry/namespace > defaultUrl
+        if (StringUtils.isNotBlank(customPattern)) {
+            return formatImageUrl(customPattern, pluginInfo);
+        }
+
+        if (StringUtils.isBlank(registry) && StringUtils.isBlank(namespace)) {
+            return defaultUrl;
+        }
+
+        // Replace registry and/or namespace in the default URL
+        // URL format: oci://registry/namespace/plugin-name:version
+        if (!defaultUrl.startsWith(OCI_PROTOCOL)) {
+            return defaultUrl;
+        }
+
+        String urlWithoutProtocol = defaultUrl.substring(OCI_PROTOCOL.length());
+        String targetRegistry = StringUtils.isNotBlank(registry) ? registry : DEFAULT_IMAGE_REGISTRY;
+        String targetNamespace = StringUtils.isNotBlank(namespace) ? namespace : DEFAULT_IMAGE_NAMESPACE;
+
+        // Find the first slash to locate registry end
+        int firstSlash = urlWithoutProtocol.indexOf('/');
+        if (firstSlash == -1) {
+            return defaultUrl;
+        }
+
+        // Find the second slash to locate namespace end
+        int secondSlash = urlWithoutProtocol.indexOf('/', firstSlash + 1);
+        if (secondSlash == -1) {
+            return defaultUrl;
+        }
+
+        // Extract the plugin name and version part (after second slash)
+        String pluginPath = urlWithoutProtocol.substring(secondSlash + 1);
+
+        // Rebuild the URL with new registry and namespace
+        return OCI_PROTOCOL + targetRegistry + "/" + targetNamespace + "/" + pluginPath;
+    }
+
     private void fillPluginConfigExample(Plugin plugin, String content) {
         String example;
         try {

helm/templates/deployment.yaml

@@ -1,4 +1,6 @@
 {{- $o11y := merge (dict) .Values.o11y .Values.global.o11y }}
+{{- $pluginImageRegistry := .Values.pluginServer.imageRegistry | default .Values.global.hub }}
+{{- $pluginImageNamespace := .Values.pluginServer.imageNamespace | default .Values.global.pluginNamespace }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -74,6 +76,20 @@ spec:
             - name: HIGRESS_ADMIN_WASM_PLUGIN_CUSTOM_IMAGE_URL_PATTERN
               value: "{{ .Values.pluginServer.urlPattern }}"
             {{- end }}
+            {{- if and .Values.pluginServer.imageRegistry (not (hasKey .Values.podEnvs "HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_REGISTRY")) }}
+            - name: HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_REGISTRY
+              value: "{{ .Values.pluginServer.imageRegistry }}"
+            {{- else if and $pluginImageRegistry (not (hasKey .Values.podEnvs "HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_REGISTRY")) }}
+            - name: HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_REGISTRY
+              value: "{{ $pluginImageRegistry }}"
+            {{- end }}
+            {{- if and .Values.pluginServer.imageNamespace (not (hasKey .Values.podEnvs "HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_NAMESPACE")) }}
+            - name: HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_NAMESPACE
+              value: "{{ .Values.pluginServer.imageNamespace }}"
+            {{- else if and $pluginImageNamespace (not (hasKey .Values.podEnvs "HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_NAMESPACE")) }}
+            - name: HIGRESS_ADMIN_WASM_PLUGIN_IMAGE_NAMESPACE
+              value: "{{ $pluginImageNamespace }}"
+            {{- end }}
             {{- if .Values.podEnvs }}
             {{- range $key, $val := .Values.podEnvs }}
             - name: {{ $key }}

helm/values.yaml

@@ -9,6 +9,13 @@ global:
     # cluster domain. Default value is "cluster.local".
     clusterDomain: "cluster.local"
 
+  # -- Default hub (registry) for Higress images, passed from parent chart.
+  # Used for plugin image registry when pluginServer.imageRegistry is not set.
+  hub: ""
+  # -- Plugin image namespace for built-in plugins, passed from parent chart.
+  # Used when pluginServer.imageNamespace is not set. Default is "plugins".
+  pluginNamespace: ""
+
   # Observability (o11y) configurations
   o11y:
     enabled: false
@@ -130,3 +137,9 @@ pvc:
 
 pluginServer:
   urlPattern: "http://higress-plugin-server.higress-system.svc/plugins/${name}/${version}/plugin.wasm"
+  # -- Plugin image registry for built-in plugins. If set, will override the default registry in plugins.properties.
+  # Example: "my-registry.example.com"
+  imageRegistry: ""
+  # -- Plugin image namespace for built-in plugins. If set, will override the default namespace in plugins.properties.
+  # Default namespace is "plugins". Example: "my-plugins"
+  imageNamespace: ""