Update GUI, types and Port in API Server

Alluxio · Jan 4, 2024 · 7d47c73 · 7d47c73
1 parent 1b2952b
commit 7d47c73
Show file tree

Hide file tree

Showing 26 changed files with 28 additions and 61 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Documentation/devhandbook.md b/Documentation/devhandbook.md
@@ -35,15 +35,15 @@ Build dokcer image by running `docker build -t <docker username>/alluxio-operato
 
 * Example:
   ```shell
-  docker buildx build --platform linux/amd64 -t kshou433/alluxio-operator:withAPIServer_v6.0 -f dev/build/Dockerfile .
+  docker buildx build --platform linux/amd64 -t kshou433/alluxio-operator:withAPIServer_v6.1 -f dev/build/Dockerfile .
   ```
 
 ### Step 3
 Push image to docker hub : `docker push <docker username>/alluxio-operator:<tag>`.
 
 * Example:
   ```shell
-  docker push kshou433/alluxio-operator:withAPIServer_v6.0
+  docker push kshou433/alluxio-operator:withAPIServer_v6.1
   ```
 
 ### Step 4
@@ -65,7 +65,7 @@ Update image url and tage in ```operator-config.yaml```
 `kubectl -n monitoring port-forward svc/prometheus-k8s 9090`
 
 ### Access API Server Port
-`kubectl port-forward -n alluxio-operator <api-server-controller Pod Name> 5220:5220`
+`kubectl port-forward -n alluxio-operator <api-server-controller Pod Name> <LOCAL PORT>:80`
 
 Then use `curl` to do REST API Request.
 

diff --git a/cmd/.DS_Store b/cmd/.DS_Store
diff --git a/cmd/api_server/.DS_Store b/cmd/api_server/.DS_Store
diff --git a/cmd/api_server/api_server/.DS_Store b/cmd/api_server/api_server/.DS_Store
diff --git a/cmd/api_server/api_server/endpoints/types.go b/cmd/api_server/api_server/endpoints/types.go
@@ -46,7 +46,7 @@ type DatasetConfig struct {
 
 // Dataset todo change the `json:"datasetConfig"` captial letter
 type Dataset struct {
-	DatasetConfig DatasetConfig           `json:"datasetConfig"`
+	DatasetConfig DatasetConfig           `json:"dataset-config"`
 	Status        *v1alpha1.DatasetStatus `json:"status,omitempty"`
 }
 

diff --git a/cmd/api_server/api_server/gui/asset-manifest.json b/cmd/api_server/api_server/gui/asset-manifest.json
@@ -1,13 +1,13 @@
 {
   "files": {
-    "main.css": "/static/css/main.15468a32.css",
-    "main.js": "/static/js/main.0e4f4206.js",
+    "main.css": "/static/css/main.e6c13ad2.css",
+    "main.js": "/static/js/main.7eac36e3.js",
     "index.html": "/index.html",
-    "main.15468a32.css.map": "/static/css/main.15468a32.css.map",
-    "main.0e4f4206.js.map": "/static/js/main.0e4f4206.js.map"
+    "main.e6c13ad2.css.map": "/static/css/main.e6c13ad2.css.map",
+    "main.7eac36e3.js.map": "/static/js/main.7eac36e3.js.map"
   },
   "entrypoints": [
-    "static/css/main.15468a32.css",
-    "static/js/main.0e4f4206.js"
+    "static/css/main.e6c13ad2.css",
+    "static/js/main.7eac36e3.js"
   ]
 }
diff --git a/cmd/api_server/api_server/gui/index.html b/cmd/api_server/api_server/gui/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.0e4f4206.js"></script><link href="/static/css/main.15468a32.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.7eac36e3.js"></script><link href="/static/css/main.e6c13ad2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/cmd/api_server/api_server/gui/static/css/main.15468a32.css.map b/cmd/api_server/api_server/gui/static/css/main.15468a32.css.map
diff --git a/...i_server/gui/static/css/main.15468a32.css → ...i_server/gui/static/css/main.e6c13ad2.css b/...i_server/gui/static/css/main.15468a32.css → ...i_server/gui/static/css/main.e6c13ad2.css
diff --git a/cmd/api_server/api_server/gui/static/css/main.e6c13ad2.css.map b/cmd/api_server/api_server/gui/static/css/main.e6c13ad2.css.map
diff --git a/cmd/api_server/api_server/gui/static/js/main.0e4f4206.js b/cmd/api_server/api_server/gui/static/js/main.0e4f4206.js
diff --git a/cmd/api_server/api_server/gui/static/js/main.0e4f4206.js.map b/cmd/api_server/api_server/gui/static/js/main.0e4f4206.js.map
diff --git a/cmd/api_server/api_server/gui/static/js/main.7eac36e3.js b/cmd/api_server/api_server/gui/static/js/main.7eac36e3.js
diff --git a/...ui/static/js/main.0e4f4206.js.LICENSE.txt → ...ui/static/js/main.7eac36e3.js.LICENSE.txt b/...ui/static/js/main.0e4f4206.js.LICENSE.txt → ...ui/static/js/main.7eac36e3.js.LICENSE.txt
diff --git a/cmd/api_server/api_server/gui/static/js/main.7eac36e3.js.map b/cmd/api_server/api_server/gui/static/js/main.7eac36e3.js.map
diff --git a/cmd/api_server/gui/alluxio.png b/cmd/api_server/gui/alluxio.png
diff --git a/cmd/api_server/gui/asset-manifest.json b/cmd/api_server/gui/asset-manifest.json
@@ -1,13 +1,13 @@
 {
   "files": {
     "main.css": "/static/css/main.e6c13ad2.css",
-    "main.js": "/static/js/main.c32d2a80.js",
+    "main.js": "/static/js/main.a453dc33.js",
     "index.html": "/index.html",
     "main.e6c13ad2.css.map": "/static/css/main.e6c13ad2.css.map",
-    "main.c32d2a80.js.map": "/static/js/main.c32d2a80.js.map"
+    "main.a453dc33.js.map": "/static/js/main.a453dc33.js.map"
   },
   "entrypoints": [
     "static/css/main.e6c13ad2.css",
-    "static/js/main.c32d2a80.js"
+    "static/js/main.a453dc33.js"
   ]
 }
diff --git a/cmd/api_server/gui/index.html b/cmd/api_server/gui/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.c32d2a80.js"></script><link href="/static/css/main.e6c13ad2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/alluxio.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Alluxio K8S Operator Dashboard: Manage Alluxio Cluster and Dataset via GUI"/><link rel="apple-touch-icon" href="/alluxio.png"/><link rel="manifest" href="/manifest.json"/><title>Alluxio K8S Operator Dashboard</title><script defer="defer" src="/static/js/main.a453dc33.js"></script><link href="/static/css/main.e6c13ad2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/cmd/api_server/gui/static/js/main.a453dc33.js b/cmd/api_server/gui/static/js/main.a453dc33.js
diff --git a/...ui/static/js/main.c32d2a80.js.LICENSE.txt → ...ui/static/js/main.a453dc33.js.LICENSE.txt b/...ui/static/js/main.c32d2a80.js.LICENSE.txt → ...ui/static/js/main.a453dc33.js.LICENSE.txt
@@ -38,39 +38,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-/**
- * @remix-run/router v1.14.0
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-
-/**
- * React Router DOM v6.21.0
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-
-/**
- * React Router v6.21.0
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-
 /** @license React v16.13.1
  * react-is.production.min.js
  *

diff --git a/cmd/api_server/gui/static/js/main.a453dc33.js.map b/cmd/api_server/gui/static/js/main.a453dc33.js.map
diff --git a/cmd/api_server/gui/static/js/main.c32d2a80.js b/cmd/api_server/gui/static/js/main.c32d2a80.js
diff --git a/cmd/api_server/gui/static/js/main.c32d2a80.js.map b/cmd/api_server/gui/static/js/main.c32d2a80.js.map
diff --git a/cmd/api_server/main.go b/cmd/api_server/main.go
@@ -38,7 +38,7 @@ func startAPIServerManager() {
 
 	mgr, err := apiserver.NewManager(ctrl.GetConfigOrDie(), apiserver.Options{
 		Scheme:         scheme,
-		Port:           5220,
+		Port:           80,
 		AllowedDomains: []string{},
 	})
 	if err != nil {

diff --git a/operator-config.yaml b/operator-config.yaml
@@ -1,5 +1,5 @@
 image: docker.io/kshou433/alluxio-operator
-imageTag: withAPIServer_v6.0
+imageTag: withAPIServer_v6.1
 imagePullPolicy: Always
 alluxio-csi:
   enabled: 'false'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.0e4f4206.js"></script><link href="/static/css/main.15468a32.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.7eac36e3.js"></script><link href="/static/css/main.e6c13ad2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>