Skip to content

update links from /v2/ to /main/ #1901

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.

Sign up for GitHub

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

Open
pwright wants to merge 1 commit into
base: main
Choose a base branch
from
Open

update links from /v2/ to /main/ #1901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ Skupper v1 will continue to be maintained but no new significant features are pl
# Useful Links
Using Skupper v2

* [Simple Example](https://github.com/skupperproject/skupper/blob/v2/cmd/controller/example/README.md)
* [Network Observer Deployment](https://github.com/skupperproject/skupper/blob/v2/cmd/network-observer/resources/README.md)
* [Simple Example](https://github.com/skupperproject/skupper/blob/main/cmd/controller/example/README.md)
* [Network Observer Deployment](https://github.com/skupperproject/skupper/blob/main/cmd/network-observer/resources/README.md)
* [Redis Example](https://github.com/skupperproject/skupper-example-redis/tree/v2)

# Questions and Feedback
Expand Down
34 changes: 17 additions & 17 deletions cmd/controller/example/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Installing the skupper controller

```
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_access_grant_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_access_token_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_attached_connector_anchor_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_attached_connector_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_certificate_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_connector_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_link_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_listener_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_router_access_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_secured_access_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_site_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/deploy_cluster_scope.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_access_grant_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_access_token_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_attached_connector_anchor_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_attached_connector_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_certificate_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_connector_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_link_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_listener_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_router_access_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_secured_access_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_site_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/deploy_cluster_scope.yaml
```

# Deploy application in two namespaces (or contexts)
Expand All @@ -32,31 +32,31 @@ kubectl create deployment backend --image quay.io/skupper/hello-world-backend --
# Create sites

```
kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/example/site1.yaml
kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/example/site1.yaml
```

```
kubectl apply -n east -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/example/site2.yaml
kubectl apply -n east -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/example/site2.yaml
```

# Expose backend in east site

```
kubectl apply -n east -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/example/connector.yaml
kubectl apply -n east -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/example/connector.yaml
```

# Consume backend in west site

```
kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/example/listener.yaml
kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/example/listener.yaml
```

# Link sites

Create a Grant in west site:

```
kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/example/access_grant.yaml
kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/example/access_grant.yaml
```

Wait until url and ca fields in status are set:
Expand Down
2 changes: 1 addition & 1 deletion cmd/network-observer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ access the Swagger UI at `http://localhost:8080/swagger/`.
To edit the specification using a hosted (swagger
editor)[https://editor-next.swagger.io/], open the editor in your browser, and
import the spec by URL (File -> Import URL) from
`https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/network-observer/spec/openapi.yaml`.
`https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/network-observer/spec/openapi.yaml`.

## Metrics

Expand Down
2 changes: 1 addition & 1 deletion cmd/network-observer/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package main

//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=.oapi-codegen.cfg ./spec/openapi.yaml
Copy link
Contributor

@c-kruse c-kruse Jan 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a different v2!

//go:generate go run github.com/oapi-codegen/oapi-codegen/main/cmd/oapi-codegen --config=.oapi-codegen.cfg ./spec/openapi.yaml
//go:generate go run ./codegen -o ./internal/api/extras_gen.go ./internal/api/types_gen.go
//go:generate go fmt ./internal/api
2 changes: 1 addition & 1 deletion cmd/network-observer/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
package main

import (
_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
_ "github.com/oapi-codegen/oapi-codegen/main/cmd/oapi-codegen"
Copy link
Contributor

@c-kruse c-kruse Jan 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one also should not be changed

)