Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.vscode
/bin
/gopath
/Godeps/_workspace/src/github.com/coreos-inc/bridge
/Godeps/_workspace/src/github.com/openshift/console
/frontend/.cache-loader
/frontend/__coverage__
/frontend/public/bower_components
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ Remove the `--headless` flag to Chrome (chromeOptions) in `frontend/integration-

Checkout and build [dex](https://github.com/coreos/dex/).

`./bin/dex serve ../../coreos-inc/bridge/contrib/dex-config-dev.yaml`
`./bin/dex serve ../../openshift/console/contrib/dex-config-dev.yaml`

Run bridge with the following options:

Expand Down
2 changes: 1 addition & 1 deletion auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const (
errorInvalidCode = "invalid_code"
)

var log = capnslog.NewPackageLogger("github.com/coreos-inc/bridge", "auth")
var log = capnslog.NewPackageLogger("github.com/openshift/console", "auth")

type Authenticator struct {
tokenVerifier func(string) (*loginState, error)
Expand Down
4 changes: 2 additions & 2 deletions build-backend
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ set -e
PROJECT_DIR=$(basename ${PWD})

GIT_TAG=`git describe --always --tags HEAD`
LD_FLAGS="-w -X github.com/coreos-inc/bridge/version.Version=${GIT_TAG}"
LD_FLAGS="-w -X github.com/openshift/console/version.Version=${GIT_TAG}"

CGO_ENABLED=0 go build -ldflags "${LD_FLAGS}" -o bin/bridge github.com/coreos-inc/bridge/cmd/bridge
CGO_ENABLED=0 go build -ldflags "${LD_FLAGS}" -o bin/bridge github.com/openshift/console/cmd/bridge
4 changes: 2 additions & 2 deletions builder-run
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ done
docker run $ENV_STR --rm --net=host \
--user="${BUILDER_RUN_USER}" \
$VOLUME_MOUNT \
-v "$(pwd)":/go/src/github.com/coreos-inc/bridge \
-w /go/src/github.com/coreos-inc/bridge \
-v "$(pwd)":/go/src/github.com/openshift/console \
-w /go/src/github.com/openshift/console \
$BUILDER_IMAGE "$@"
10 changes: 5 additions & 5 deletions cmd/bridge/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import (
"github.com/coreos/pkg/capnslog"
"github.com/coreos/pkg/flagutil"

"github.com/coreos-inc/bridge/auth"
"github.com/coreos-inc/bridge/pkg/proxy"
"github.com/coreos-inc/bridge/server"
"github.com/openshift/console/auth"
"github.com/openshift/console/pkg/proxy"
"github.com/openshift/console/server"
)

var (
log = capnslog.NewPackageLogger("github.com/coreos-inc/bridge", "cmd/main")
log = capnslog.NewPackageLogger("github.com/openshift/console", "cmd/main")
)

const (
Expand All @@ -30,7 +30,7 @@ const (
)

func main() {
rl := capnslog.MustRepoLogger("github.com/coreos-inc/bridge")
rl := capnslog.MustRepoLogger("github.com/openshift/console")
capnslog.SetFormatter(capnslog.NewStringFormatter(os.Stderr))

fs := flag.NewFlagSet("bridge", flag.ExitOnError)
Expand Down
4 changes: 2 additions & 2 deletions docs-internal/operators.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ The UI detects if operators are installed in the cluster and conditionally enabl

## Operator feature detection

We determine if the feature is enabled by first checking if the operator feature exists. For more information, see [k8s/k8s.js](https://github.com/coreos-inc/bridge/blob/master/frontend/public/module/k8s/k8s.js).
We determine if the feature is enabled by first checking if the operator feature exists. For more information, see [k8s/k8s.js](https://github.com/openshift/console/blob/master/frontend/public/module/k8s/k8s.js).

## UI Components

The update UI is divided into several key components and is abstracted such that additional channels could be added in the future e.g. Tectonic channel, Container Linux channel, etc.

All components live in [components/cluster-updates](https://github.com/coreos-inc/bridge/blob/master/frontend/public/components/cluster-updates). Each major component has a description in the file of how it's intended to be used.
All components live in [components/cluster-updates](https://github.com/openshift/console/blob/master/frontend/public/components/cluster-updates). Each major component has a description in the file of how it's intended to be used.

## Data flow

Expand Down
4 changes: 2 additions & 2 deletions docs-internal/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Decide on an incremented release semantic $VERSION.

## Docs

Add changes to the [changelog](https://github.com/coreos-inc/bridge/blob/master/CHANGES.md) for the new version.
Add changes to the [changelog](https://github.com/openshift/console/blob/master/CHANGES.md) for the new version.
Make note of any newly introduced known issues, breaking changes or removed features.

## Tag
Expand All @@ -33,7 +33,7 @@ docker push quay.io/coreos/tectonic-console:$VERSION

## Github

Create a [release](https://github.com/coreos-inc/bridge/releases) on Github with release notes by copying the changelog.
Create a [release](https://github.com/openshift/console/releases) on Github with release notes by copying the changelog.

## Update Installer

Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bridge",
"description": "CoreOS Tectonic Dashboard",
"repository": "https://github.com/coreos-inc/bridge",
"repository": "https://github.com/openshift/console",
"version": "0.1.0",
"private": true,
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package: github.com/coreos-inc/bridge
package: github.com/openshift/console
testImports: []
import:
- package: gopkg.in/square/go-jose.v2
Expand Down
2 changes: 1 addition & 1 deletion jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ EOF
# shellcheck disable=SC2154
curl -o /dev/null --silent -X POST --user "${GITHUB_CREDENTIALS}" \
--data "$data" \
"https://api.github.com/repos/coreos-inc/bridge/statuses/${ghprbActualCommit}"
"https://api.github.com/repos/openshift/console/statuses/${ghprbActualCommit}"
set -x
}

Expand Down
2 changes: 1 addition & 1 deletion server/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/http"

"github.com/coreos-inc/bridge/auth"
"github.com/openshift/console/auth"
)

// Middleware generates a middleware wrapper for request hanlders.
Expand Down
8 changes: 4 additions & 4 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/coreos/pkg/capnslog"
"github.com/coreos/pkg/health"

"github.com/coreos-inc/bridge/auth"
"github.com/coreos-inc/bridge/pkg/proxy"
"github.com/coreos-inc/bridge/version"
"github.com/openshift/console/auth"
"github.com/openshift/console/pkg/proxy"
"github.com/openshift/console/version"

"github.com/Sirupsen/logrus"
)
Expand All @@ -40,7 +40,7 @@ const (
)

var (
plog = capnslog.NewPackageLogger("github.com/coreos-inc/bridge", "server")
plog = capnslog.NewPackageLogger("github.com/openshift/console", "server")
)

type jsGlobals struct {
Expand Down
2 changes: 1 addition & 1 deletion test-backend
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fi

# split TEST into an array and prepend repo path to each local package
split=(${TEST// / })
TEST=${split[@]/#/github.com/coreos-inc/bridge/}
TEST=${split[@]/#/github.com/openshift/console/}

echo "Running tests..."
go test ${COVER} $@ ${TEST}
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package version

// version.Version should be provided at build time with
//-ldflags "-X github.com/coreos-inc/bridge/version.Version $GIT_TAG"
//-ldflags "-X github.com/openshift/console/version.Version $GIT_TAG"
var Version string