onedev/k8s-helper

Change api endpoint from rest to api
Robin Shen committed 3 years ago

f8d5db43

1 parent 0b3b19fb
Release

Total 2 files Show one by one

■ ■ ■ ■ ■ ■

pom.xml

		skipped 9 lines
10	10		<version>1.0.5</version>
11	11		</parent>
12	12		<artifactId>k8s-helper</artifactId>
13		-	<version>2.1.1</version>
	13	+	<version>2.1.2</version>
14	14		<build>
15	15		<plugins>
16	16		<plugin>
		skipped 74 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/KubernetesHelper.java

		skipped 348 lines
349	349		FileUtils.createDir(getMarkHome());
350	350		if (test) {
351	351		logger.info("Testing server connectivity with '{}'...", serverUrl);
352		-	WebTarget target = client.target(serverUrl).path("rest/k8s/test");
	352	+	WebTarget target = client.target(serverUrl).path("api/k8s/test");
353	353		Invocation.Builder builder = target.request();
354	354		builder.header(HttpHeaders.AUTHORIZATION, BEARER + " " + jobToken);
355	355		try (Response response = builder.get()) {
		skipped 17 lines
373	373		Lists.newArrayList("echo hello from container"));
374	374		}
375	375		} else {
376		-	WebTarget target = client.target(serverUrl).path("rest/k8s/job-context");
	376	+	WebTarget target = client.target(serverUrl).path("api/k8s/job-context");
377	377		Invocation.Builder builder = target.request();
378	378		builder.header(HttpHeaders.AUTHORIZATION, BEARER + " " + jobToken);
379	379
		skipped 14 lines
394	394		File workspaceCache = null;
395	395
396	396		logger.info("Allocating job caches from {}...", serverUrl);
397		-	target = client.target(serverUrl).path("rest/k8s/allocate-job-caches");
	397	+	target = client.target(serverUrl).path("api/k8s/allocate-job-caches");
398	398		builder = target.request();
399	399		builder.header(HttpHeaders.AUTHORIZATION, BEARER + " " + jobToken);
400	400		Map<CacheInstance, String> cacheAllocations;
		skipped 108 lines
509	509
510	510		logger.info("Downloading job dependencies from {}...", serverUrl);
511	511
512		-	target = client.target(serverUrl).path("rest/k8s/download-dependencies");
	512	+	target = client.target(serverUrl).path("api/k8s/download-dependencies");
513	513		builder = target.request();
514	514		builder.header(HttpHeaders.AUTHORIZATION, BEARER + " " + jobToken);
515	515
		skipped 175 lines
691	691		Client client = ClientBuilder.newClient();
692	692		try {
693	693		logger.info("Reporting job caches to '{}'...", serverUrl);
694		-	WebTarget target = client.target(serverUrl).path("rest/k8s/report-job-caches");
	694	+	WebTarget target = client.target(serverUrl).path("api/k8s/report-job-caches");
695	695		Invocation.Builder builder = target.request();
696	696		builder.header(HttpHeaders.AUTHORIZATION, BEARER + " " + jobToken);
697	697		StringBuilder toStringBuilder = new StringBuilder();
		skipped 132 lines
830	830		Client client = ClientBuilder.newClient();
831	831		client.property(ClientProperties.REQUEST_ENTITY_PROCESSING, "CHUNKED");
832	832		try {
833		-	WebTarget target = client.target(serverUrl).path("rest/k8s/run-server-step");
	833	+	WebTarget target = client.target(serverUrl).path("api/k8s/run-server-step");
834	834		Invocation.Builder builder = target.request();
835	835		builder.header(HttpHeaders.AUTHORIZATION, BEARER + " " + jobToken);
836	836
		skipped 117 lines

Change api endpoint from rest to api