Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign URLBase and NetworkRule #772

Merged
merged 7 commits into from
Jun 29, 2023

Conversation

jlandowner
Copy link
Member

@jlandowner jlandowner commented Jun 29, 2023

Close #744

  • Remove Template Validation Webhook to be able to include default Templates in charts
  • Remove URLBase from each Workspace Template
  • Change controller-manager cli option(split --workspace-urlbase to --workspace-urlbase-domain, --workspace-urlbase-host and --workspace-urlbase-protocol)
  • Change NetworkRule
    • add protocol and hostPrefix
    • remove name and host
  • if hostPrefix is empty, portXXXX is used
  • Change NetworkRule view
  • only {{NETRULE}}, {{WORKSPACE}} and {{USER}} can be used in URLBaseHost

Workspace YAML

apiVersion: cosmo-workspace.github.io/v1alpha1
kind: Workspace
metadata:
  creationTimestamp: "2023-06-28T13:36:28Z"
  generation: 11
  name: ws1
  namespace: cosmo-user-tom
  resourceVersion: "69345"
  uid: f77298fc-e509-4f1b-9df6-8ce76afaa21d
spec:
  network:
  - customHostPrefix: main
    httpPath: /
    portNumber: 18080
    protocol: http
    public: false
  - httpPath: /
    portNumber: 7702
    protocol: http
    public: false
  - customHostPrefix: proxy1
    httpPath: /aaa
    portNumber: 7702
    protocol: http
    public: false
  replicas: 1
  template:
    name: dev-code-server
status:
  config:
    deploymentName: workspace
    mainServicePortName: main
    serviceName: workspace
  instance:
    apiVersion: cosmo-workspace.github.io/v1alpha1
    creationTimestamp: "2023-06-28T13:36:28Z"
    kind: Instance
    name: ws1
    namespace: cosmo-user-tom
    resourceVersion: "69343"
    uid: 4c61c39f-6801-4046-8ff2-033fd1520388
  phase: Running
  urls:
    http://main/: https://main-ws1-tom-k3d-code-server.example.com/
    http://port7702/: https://port7702-ws1-tom-k3d-code-server.example.com/
    http://proxy1/aaa: https://proxy1-ws1-tom-k3d-code-server.example.com/aaa

Workspace View

スクリーンショット 2023-06-29 16 58 10

Main NetworkRule Edit Dialog

スクリーンショット 2023-06-29 16 58 21

NetworkRule Add Dialog

スクリーンショット 2023-06-29 17 33 35

- remove urlbase from workspace config
- merge wsnet, wscfg pkg to workspace
- remove urlbase from Worlspace Template
- remove name from NetworkRule
- change host to hostPrefix in NetworkRule
- add Protocol on NetworkRule for future(only http for now)
- update NetworkRule view
@jlandowner jlandowner added controller-manager Controller Manager cosmoctl cosmoctl dashboard Dashboard server and UI breaking-change Changes that break compatibility. labels Jun 29, 2023
@jlandowner jlandowner requested a review from oruharo June 29, 2023 08:40
@oruharo oruharo merged commit d5664bd into cosmo-workspace:main Jun 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking-change Changes that break compatibility. controller-manager Controller Manager cosmoctl cosmoctl dashboard Dashboard server and UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

remove URLBase on Workspace Template and only set by helm in installation steps.
2 participants