Skip to content

Commit 52e8bb2

Browse files
yaacovyaacov
committed
typo
1 parent 7f2f1c4 commit 52e8bb2

File tree

6 files changed

+21
-17
lines changed

6 files changed

+21
-17
lines changed

‎deploy/README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ ssh cirros@api.crc.testing -p ${nodePort}
2121

2222
# Deploy k8s+kubevirt noVNC demo deployment:
2323
make deploy
24-
kubectl get ingress -n oc-gate
24+
kubectl get ingress -n kube-gateway
2525

2626
# Wait for oc gate noVNC web application to deploy
27-
kubectl get pods -n oc-gate
27+
kubectl get pods -n kube-gateway
2828

2929
# Get administarator token
3030
bt=$(make admin-token -s)
@@ -35,10 +35,10 @@ vm=testvm
3535
ns=default
3636
apigroup=subresources.kubevirt.io
3737
resource=virtualmachineinstances
38-
proxyurl=https://oc-gate.apps.example.com
38+
proxyurl=https://kube-gateway.apps.example.com
3939

4040
# Use admin token to request a temporary JWT access key
41-
data='{"metadata":{"namespace":"oc-gate"},"spec":{"namespace":"'${ns}'","apiGroups":["'${apigroup}'"],resources":["'${resource}'"],"resourceNames":"'${vm}'"}}'
41+
data='{"metadata":{"namespace":"kube-gateway"},"spec":{"namespace":"'${ns}'","apiGroups":["'${apigroup}'"],resources":["'${resource}'"],"resourceNames":"'${vm}'"}}'
4242

4343
# Use the admin token to create a temporary JWT access key for the testvm
4444
jwt=$(curl -k -H 'Accept: application/json' -H "Authorization: Bearer ${bt}" -H "Content-Type: application/json" --request POST --data "${data}" "${proxyurl}/auth/gettoken" | jq .status.token)
@@ -65,10 +65,10 @@ oc get pods --all-namespaces
6565

6666
# Deploy the OAuth2 demo web application
6767
make deploy-ouath2
68-
oc get routes -n oc-gate
68+
oc get routes -n kube-gateway
6969

70-
# Start the web application, oc-gate proxy automatically start oauth2 login
71-
google-chrome https://oc-gate.apps-crc.testing
70+
# Start the web application, kube-gateway proxy automatically start oauth2 login
71+
google-chrome https://kube-gateway.apps-crc.testing
7272
```
7373

7474
### noVNC
@@ -94,10 +94,10 @@ vm=testvm
9494
ns=default
9595
apigroup=subresources.kubevirt.io
9696
resource=virtualmachineinstances
97-
proxyurl=https://oc-gate.apps-crc.testing
97+
proxyurl=https://kube-gateway.apps-crc.testing
9898

9999
# Use admin token to request a temporary JWT access key
100-
data='{"metadata":{"namespace":"oc-gate"},"spec":{"namespace":"'${ns}'","apiGroups":["'${apigroup}'"],resources":["'${resource}'"],"resourceNames":"'${vm}'"}}'
100+
data='{"metadata":{"namespace":"kube-gateway"},"spec":{"namespace":"'${ns}'","apiGroups":["'${apigroup}'"],resources":["'${resource}'"],"resourceNames":"'${vm}'"}}'
101101
jwt=$(curl -k -H 'Accept: application/json' -H "Authorization: Bearer ${bt}" -H "Content-Type: application/json" --request POST --data "${data}" "${proxyurl}/auth/gettoken" | jq .status.token)
102102

103103
# Open the noVNC web application using google-chrome

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ require (
77
github.com/gogo/protobuf v1.3.2 // indirect
88
github.com/golang/protobuf v1.5.2 // indirect
99
github.com/google/gofuzz v1.2.0 // indirect
10-
github.com/yaacov/kube-gateway-operator v0.0.3
10+
github.com/yaacov/kube-gateway v0.1.8
11+
github.com/yaacov/oc-gate-operator v0.0.3
1112
golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c // indirect
1213
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
1314
golang.org/x/text v0.3.6 // indirect

‎go.sum‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,12 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1
360360
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
361361
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
362362
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
363-
github.com/yaacov/kube-gateway-operator v0.0.2 h1:0rmEdApXWIAcVKRDdBCxDxbwnxbCFHZezsgxiZ0evtM=
364-
github.com/yaacov/kube-gateway-operator v0.0.2/go.mod h1:648foZfa/tlaqvoxTJbbAG8BnVJ3jZB9zlrBI48KaPE=
365-
github.com/yaacov/kube-gateway-operator v0.0.3 h1:oOCj8VWWQhlGp2Bp3UgdzUD/K1t24Ndt1id3P/QAJBo=
366-
github.com/yaacov/kube-gateway-operator v0.0.3/go.mod h1:Mk9ok9qkUm7GojzrmG6nR6iTNX6GSZoBckutuBICi6Q=
363+
github.com/yaacov/kube-gateway v0.1.8 h1:NGLBxpr2f8f2JGl9o/gonGGBfw5gbYfGDALgCDXNdow=
364+
github.com/yaacov/kube-gateway v0.1.8/go.mod h1:hIZWblX2neIWkEO6QoW9M799FS3sQw07hSNqIW4+AKM=
365+
github.com/yaacov/oc-gate-operator v0.0.2 h1:0rmEdApXWIAcVKRDdBCxDxbwnxbCFHZezsgxiZ0evtM=
366+
github.com/yaacov/oc-gate-operator v0.0.2/go.mod h1:648foZfa/tlaqvoxTJbbAG8BnVJ3jZB9zlrBI48KaPE=
367+
github.com/yaacov/oc-gate-operator v0.0.3 h1:oOCj8VWWQhlGp2Bp3UgdzUD/K1t24Ndt1id3P/QAJBo=
368+
github.com/yaacov/oc-gate-operator v0.0.3/go.mod h1:Mk9ok9qkUm7GojzrmG6nR6iTNX6GSZoBckutuBICi6Q=
367369
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
368370
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
369371
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -470,6 +472,7 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr
470472
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
471473
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
472474
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
475+
golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
473476
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 h1:0Ja1LBD+yisY6RWM/BH7TJVXWsSjs2VwBSmvSX4HdBc=
474477
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
475478
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

‎pkg/gatetoken/gatetoken.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"log"
77
"net/http"
88

9-
ocgatev1beta1 "github.com/yaacov/kube-gateway-operator/api/v1beta1"
9+
ocgatev1beta1 "github.com/yaacov/oc-gate-operator/api/v1beta1"
1010
)
1111

1212
// Server holds information required for serving files.

‎pkg/gatetoken/token.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88

99
jwt "github.com/dgrijalva/jwt-go"
10-
ocgatev1beta1 "github.com/yaacov/kube-gateway-operator/api/v1beta1"
10+
ocgatev1beta1 "github.com/yaacov/oc-gate-operator/api/v1beta1"
1111
corev1 "k8s.io/api/core/v1"
1212
)
1313

‎pkg/proxy/token.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strings"
77

88
"github.com/dgrijalva/jwt-go"
9-
ocgatev1beta1 "github.com/yaacov/kube-gateway-operator/api/v1beta1"
9+
ocgatev1beta1 "github.com/yaacov/oc-gate-operator/api/v1beta1"
1010
)
1111

1212
func authenticateToken(token string, secret []byte, publicKey *rsa.PublicKey) (*jwt.Token, error) {

0 commit comments

Comments
 (0)