Skip to content

Commit

Permalink
Revert "【GLCC】Higress Console 支持 Gateway API (higress-group#371)"
Browse files Browse the repository at this point in the history
This reverts commit c555854.
  • Loading branch information
johnlanni committed Jan 8, 2025
1 parent c555854 commit 27d9f2c
Show file tree
Hide file tree
Showing 118 changed files with 187 additions and 10,516 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import javax.annotation.PostConstruct;

import com.alibaba.higress.sdk.service.OpenAPIService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -37,7 +36,6 @@
import com.alibaba.higress.sdk.service.consumer.ConsumerService;
import com.alibaba.higress.sdk.service.kubernetes.KubernetesClientService;
import com.alibaba.higress.sdk.service.kubernetes.KubernetesModelConverter;
import com.alibaba.higress.sdk.service.HigressConfigService;

@Configuration
public class SdkConfig {
Expand Down Expand Up @@ -131,15 +129,6 @@ public WasmPluginInstanceService wasmPluginInstanceService() {
return serviceProvider.wasmPluginInstanceService();
}

@Bean
public OpenAPIService openApiService() {
return serviceProvider.openApiService();
}

@Bean
public HigressConfigService higressConfigService() {
return serviceProvider.higressConfigService();
}
@Bean
public ConsumerService consumerService() {
return serviceProvider.consumerService();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import com.alibaba.higress.sdk.service.RouteService;

@RestController("DomainsController")
@RequestMapping("/v2/domains")
@RequestMapping("/v1/domains")
@Validated
public class DomainsController {

Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,7 @@ private void initDefaultRoutes() {
Domain domain = new Domain();
domain.setName(HigressConstants.DEFAULT_DOMAIN);
domain.setEnableHttps(Domain.EnableHttps.ON);
Map<Integer, String> portAndCert = new HashMap<>();
portAndCert.put(443, DEFAULT_TLS_CERTIFICATE_NAME);
domain.setPortAndCertMap(portAndCert);
domain.setCertIdentifier(DEFAULT_TLS_CERTIFICATE_NAME);
domainService.add(domain);
} catch (ResourceConflictException e) {
// Ignore it.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,4 @@ public class HigressConstants {
public static final String INTERNAL_RESOURCE_NAME_SUFFIX = ".internal";
public static final String FALLBACK_ROUTE_NAME_SUFFIX = ".fallback";
public static final String FALLBACK_FROM_HEADER = "x-higress-fallback-from";
public static final String DEFAULT_CONFIG = "higress-config";
public static final String PORT_CONFIG = "higress-ports";
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ public class KubernetesConstants {
public static final String SECRET_TLS_KEY_FIELD = "tls.key";
public static final String YAML_SEPARATOR = "---\n";

public static class WorkMode {
public static final String KEY = "workMode";
public static final String GATEWAY = "gateway";
public static final String INGRESS = "ingress";
}



public static class Annotation {
public static final String KEY_PREFIX = "higress.io/";
public static final String NGINX_INGRESS_KEY_PREFIX = "nginx.ingress.kubernetes.io/";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,4 @@ public class Separators {
public static final String UNDERSCORE = "_";

public static final String COLON = ":";

public static final String SLASH = "/";
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.Map;

@Data
@Builder
@NoArgsConstructor
Expand All @@ -32,13 +30,12 @@ public static class EnableHttps {
public static final String ON = "on";
public static final String FORCE = "force";
}
private Boolean isIngressMode;

private String name;

private String version;

private String enableHttps;

private Map<Integer, String> portAndCertMap;
private String certIdentifier;
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ public class Route implements VersionedDto {

private String name;

private Boolean isIngressMode;

private String version;

private List<String> domains;
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 27d9f2c

Please sign in to comment.