Skip to content
This repository has been archived by the owner on Jul 16, 2021. It is now read-only.

Commit

Permalink
Repo rename helm/monocular -> kubernetes-helm/monocular
Browse files Browse the repository at this point in the history
  • Loading branch information
Adnan Abdulhussein committed Jul 3, 2017
1 parent 8364dab commit bc3f212
Show file tree
Hide file tree
Showing 69 changed files with 183 additions and 166 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Monocular
[![Build
Status](https://travis-ci.org/helm/monocular.svg?branch=master)](https://travis-ci.org/helm/monocular)
Status](https://travis-ci.org/kubernetes-helm/monocular.svg?branch=master)](https://travis-ci.org/kubernetes-helm/monocular)

Monocular is web-based UI for managing Kubernetes applications packaged as Helm
Charts. It allows you to search and discover available charts from multiple
Expand All @@ -23,7 +23,7 @@ You can use the chart in this repository to install Monocular in your cluster.
- [Nginx Ingress controller](https://github.com/kubernetes/ingress)

```console
$ helm repo add monocular https://helm.github.io/monocular
$ helm repo add monocular https://kubernetes-helm.github.io/monocular
$ helm install monocular/monocular
```

Expand All @@ -37,12 +37,12 @@ Read more on how to deploy Monocular [here](docs/deployment.md).

## Roadmap

The [Monocular roadmap is currently located in the wiki](https://github.com/helm/monocular/wiki/Roadmap).
The [Monocular roadmap is currently located in the wiki](https://github.com/kubernetes-helm/monocular/wiki/Roadmap).

## Contribute

This project is still under active development, so you'll likely encounter
[issues](https://github.com/helm/monocular/issues).
[issues](https://github.com/kubernetes-helm/monocular/issues).

Interested in contributing? Check out the [documentation](CONTRIBUTING.md).

Expand Down
4 changes: 2 additions & 2 deletions deployment/monocular/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: monocular
description: Monocular is a search and discovery front end for Helm Charts Repositories.
version: 0.4.3
appVersion: v0.2.1
home: https://github.com/helm/monocular
home: https://github.com/kubernetes-helm/monocular
sources:
- https://github.com/helm/monocular
- https://github.com/kubernetes-helm/monocular
maintainers:
- name: prydonius
email: adnan@bitnami.com
10 changes: 5 additions & 5 deletions deployment/monocular/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Monocular

[Monocular](https://github.com/helm/monocular) is web-based UI for managing Kubernetes applications packaged as Helm Charts. It allows you to search and discover available charts from multiple repositories, and install them in your cluster with one click.
[Monocular](https://github.com/kubernetes-helm/monocular) is web-based UI for managing Kubernetes applications packaged as Helm Charts. It allows you to search and discover available charts from multiple repositories, and install them in your cluster with one click.

## TL;DR;

Expand All @@ -11,7 +11,7 @@ $ helm install monocular/monocular

## Introduction

This chart bootstraps a [Monocular](https://github.com/helm/monocular) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
This chart bootstraps a [Monocular](https://github.com/kubernetes-helm/monocular) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.

## Prerequisites

Expand All @@ -26,7 +26,7 @@ It is possible to run Monocular on separate domains and without the Nginx Ingres
First, ensure you have added the Monocular chart repository:

```console
$ helm repo add monocular https://helm.github.io/monocular
$ helm repo add monocular https://kubernetes-helm.github.io/monocular
```

To install the chart with the release name `my-release`:
Expand Down Expand Up @@ -77,8 +77,8 @@ api
url: http://storage.googleapis.com/kubernetes-charts-incubator
source: https://github.com/kubernetes/charts/tree/master/incubator
- name: monocular
url: https://helm.github.io/monocular
source: https://github.com/helm/monocular/tree/master/charts
url: https://kubernetes-helm.github.io/monocular
source: https://github.com/kubernetes-helm/monocular/tree/master/charts
EOF

$ helm install monocular/monocular -f custom-repos.yaml
Expand Down
21 changes: 19 additions & 2 deletions deployment/monocular/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
The Monocular chart sets up an Ingress to serve the API and UI on the same
domain. You can get the address to access Monocular from this Ingress endpoint.
domain. You can get the address to access Monocular from this Ingress endpoint:

Visit https://github.com/helm/monocular for more information.
$ kubectl get ingress {{ template "fullname" . }}

{{ if ne (join "" .Values.ingress.hosts) "<nil>" -}}
Point your Ingress hosts to the address from the output of the above command:
{{ toYaml .Values.ingress.hosts | indent 2 }}
{{ end -}}
{{ else -}}
{{ if not (join "" .Values.api.config.cors.allowed_origins) -}}
**ERROR**: You have not configured the UI hostname on the server to accept Cross-Origin Resource Sharing requests.
See https://github.com/kubernetes-helm/monocular/blob/master/deployment/monocular/README.md#serve-monocular-frontend-and-api-on-different-domains for more information
{{ else -}}

You can access Monocular on the following domains:
{{ toYaml .Values.api.config.cors.allowed_origins | indent 2 }}
{{- end }}
{{ end -}}

Visit https://github.com/kubernetes-helm/monocular for more information.

{{ if .Values.api.config.releasesEnabled -}}
**IMPORTANT**: Releases are enabled, which will allow anybody with access to the running instance to create, list and delete any Helm release existing in your cluster.
Expand Down
2 changes: 1 addition & 1 deletion dev_env/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN curl https://glide.sh/get | sh

COPY rootfs/ /

WORKDIR /go/src/github.com/helm/monocular/src/api
WORKDIR /go/src/github.com/kubernetes-helm/monocular/src/api

ENV HOST=0.0.0.0
ENV PORT=8080
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
ports:
- 8080:8080
volumes:
- ./src/api:/go/src/github.com/helm/monocular/src/api
- ./src/api:/go/src/github.com/kubernetes-helm/monocular/src/api
# Config example file
- ./docs/config.example.yaml:/root/monocular/config/monocular.yaml
# Used for loading kubernetes context used on Helm releases integration
Expand Down
2 changes: 1 addition & 1 deletion docs/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Charts. Monocular includes a scanning back-end for indexing charts and their met

Other resources:

- [Project README](https://github.com/helm/monocular/blob/master/README.md)
- [Project README](https://github.com/kubernetes-helm/monocular/blob/master/README.md)
- [Project Background](https://deis.com/blog/2017/building-a-helm-ui/)
- [Technical Overview](https://engineering.bitnami.com/2017/02/22/what-the-helm-is-monocular.html)

Expand Down
2 changes: 1 addition & 1 deletion docs/config.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ repos:
# - "x-xsrf-token"

# Enables Helm deployment integration
# https://github.com/helm/monocular/blob/master/docs/configuration.md#enable-helm-releases-integration
# https://github.com/kubernetes-helm/monocular/tree/master/deployment/monocular#other-configuration-options
releasesEnabled: true
# Enables port forwarding for tiller Connections
# Useful if you are running the app outside of the k8s cluster during development
Expand Down
4 changes: 2 additions & 2 deletions scripts/repo-sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
# Based on https://github.com/migmartri/helm-hack-night-charts/blob/master/repo-sync.sh
# USAGE: repo-sync.sh

GIT_URL=github.com/helm/monocular.git
REPO_URL=https://helm.github.io/monocular
GIT_URL=github.com/kubernetes-helm/monocular.git
REPO_URL=https://kubernetes-helm.github.io/monocular
REPO_DIR=$TRAVIS_BUILD_DIR
CHART_PATH="$REPO_DIR/deployment/monocular"
COMMIT_CHANGES=true
Expand Down
2 changes: 1 addition & 1 deletion src/api/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include versioning.mk
include includes.mk

# dockerized development environment variables
REPO_PATH := github.com/helm/${SHORT_NAME}
REPO_PATH := github.com/kubernetes-helm/${SHORT_NAME}
DEV_ENV_IMAGE := quay.io/deis/go-dev:v0.22.0
SWAGGER_IMAGE := quay.io/goswagger/swagger:0.6.0
DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}/src/api
Expand Down
10 changes: 5 additions & 5 deletions src/api/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Build Status](https://travis-ci.org/helm/monocular.svg?branch=master)](https://travis-ci.org/helm/monocular)
[![codecov](https://codecov.io/gh/helm/monocular/branch/master/graph/badge.svg)](https://codecov.io/gh/helm/monocular)
[![Go Report Card](https://goreportcard.com/badge/github.com/helm/monocular)](https://goreportcard.com/report/github.com/helm/monocular)
[![codebeat badge](https://codebeat.co/badges/820a0d9f-5282-4a8e-b5f7-a27c217d9f0e)](https://codebeat.co/projects/github-com-helm-monocular)
[![Build Status](https://travis-ci.org/kubernetes-helm/monocular.svg?branch=master)](https://travis-ci.org/kubernetes-helm/monocular)
[![codecov](https://codecov.io/gh/kubernetes-helm/monocular/branch/master/graph/badge.svg)](https://codecov.io/gh/kubernetes-helm/monocular)
[![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-helm/monocular)](https://goreportcard.com/report/github.com/kubernetes-helm/monocular)
[![codebeat badge](https://codebeat.co/badges/2443005b-8e19-428a-8c67-14a2af60e7fd)](https://codebeat.co/projects/github-com-kubernetes-helm-monocular-master)

# Monocular API

Expand All @@ -13,7 +13,7 @@ The API is a golang HTTP RESTFul server. It abstracts away Helm Chart Repository

All commands and relative directories below assume a current working directory at the API source code root, i.e.:

- `$GOPATH/src/github.com/helm/monocular/src/api/`
- `$GOPATH/src/github.com/kubernetes-helm/monocular/src/api/`

# Building Monocular

Expand Down
8 changes: 4 additions & 4 deletions src/api/_scripts/test-cover.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ IFS=$'\n\t'

# shellcheck disable=SC2046
pkgs=$(go list $(glide novendor))
COVERAGE_EXCLUDES=("github.com/helm/monocular/src/api/swagger/models" \
"github.com/helm/monocular/src/api/swagger/restapi" \
"github.com/helm/monocular/src/api/swagger/restapi/operations" \
"github.com/helm/monocular/src/api")
COVERAGE_EXCLUDES=("github.com/kubernetes-helm/monocular/src/api/swagger/models" \
"github.com/kubernetes-helm/monocular/src/api/swagger/restapi" \
"github.com/kubernetes-helm/monocular/src/api/swagger/restapi/operations" \
"github.com/kubernetes-helm/monocular/src/api")

echo "" > coverage.txt
for p in $pkgs; do
Expand Down
2 changes: 1 addition & 1 deletion src/api/chartpackagesort/chartpackagesort.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package chartpackagesort

import (
"github.com/Masterminds/semver"
"github.com/helm/monocular/src/api/swagger/models"
"github.com/kubernetes-helm/monocular/src/api/swagger/models"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion src/api/chartpackagesort/chartpackagesort_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/Masterminds/semver"
"github.com/arschles/assert"
"github.com/helm/monocular/src/api/mocks"
"github.com/kubernetes-helm/monocular/src/api/mocks"
)

func TestSortedByName(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions src/api/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
yaml "gopkg.in/yaml.v2"

log "github.com/Sirupsen/logrus"
"github.com/helm/monocular/src/api/config/cors"
"github.com/helm/monocular/src/api/config/repos"
"github.com/kubernetes-helm/monocular/src/api/config/cors"
"github.com/kubernetes-helm/monocular/src/api/config/repos"
)

// ConfigurationWithOverrides includes default Configuration values
Expand Down
4 changes: 2 additions & 2 deletions src/api/data/cache/auto_refresher.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cache
import (
"time"

"github.com/helm/monocular/src/api/data"
"github.com/helm/monocular/src/api/jobs"
"github.com/kubernetes-helm/monocular/src/api/data"
"github.com/kubernetes-helm/monocular/src/api/jobs"
)

type refreshChartsData struct {
Expand Down
2 changes: 1 addition & 1 deletion src/api/data/cache/auto_refresher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"

"github.com/arschles/assert"
"github.com/helm/monocular/src/api/config/repos"
"github.com/kubernetes-helm/monocular/src/api/config/repos"
)

func TestNewRefreshData(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions src/api/data/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (

log "github.com/Sirupsen/logrus"

"github.com/helm/monocular/src/api/config/repos"
"github.com/helm/monocular/src/api/data"
"github.com/helm/monocular/src/api/data/cache/charthelper"
"github.com/helm/monocular/src/api/data/helpers"
"github.com/helm/monocular/src/api/swagger/models"
"github.com/helm/monocular/src/api/swagger/restapi/operations/charts"
"github.com/kubernetes-helm/monocular/src/api/config/repos"
"github.com/kubernetes-helm/monocular/src/api/data"
"github.com/kubernetes-helm/monocular/src/api/data/cache/charthelper"
"github.com/kubernetes-helm/monocular/src/api/data/helpers"
"github.com/kubernetes-helm/monocular/src/api/swagger/models"
"github.com/kubernetes-helm/monocular/src/api/swagger/restapi/operations/charts"
)

type cachedCharts struct {
Expand Down
14 changes: 7 additions & 7 deletions src/api/data/cache/cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"testing"

"github.com/arschles/assert"
"github.com/helm/monocular/src/api/config/repos"
"github.com/helm/monocular/src/api/data"
"github.com/helm/monocular/src/api/data/cache/charthelper"
"github.com/helm/monocular/src/api/data/helpers"
"github.com/helm/monocular/src/api/swagger/models"
"github.com/helm/monocular/src/api/swagger/restapi/operations/charts"
"github.com/helm/monocular/src/api/testutil"
"github.com/kubernetes-helm/monocular/src/api/config/repos"
"github.com/kubernetes-helm/monocular/src/api/data"
"github.com/kubernetes-helm/monocular/src/api/data/cache/charthelper"
"github.com/kubernetes-helm/monocular/src/api/data/helpers"
"github.com/kubernetes-helm/monocular/src/api/swagger/models"
"github.com/kubernetes-helm/monocular/src/api/swagger/restapi/operations/charts"
"github.com/kubernetes-helm/monocular/src/api/testutil"
)

var chartsImplementation = getChartsImplementation()
Expand Down
4 changes: 2 additions & 2 deletions src/api/data/cache/charthelper/chart_package_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (

log "github.com/Sirupsen/logrus"

"github.com/helm/monocular/src/api/config"
"github.com/helm/monocular/src/api/swagger/models"
"github.com/kubernetes-helm/monocular/src/api/config"
"github.com/kubernetes-helm/monocular/src/api/swagger/models"
)

const defaultTimeout time.Duration = 10 * time.Second
Expand Down
4 changes: 2 additions & 2 deletions src/api/data/cache/charthelper/chart_package_helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
httpmock "gopkg.in/jarcoal/httpmock.v1"

"github.com/arschles/assert"
"github.com/helm/monocular/src/api/config"
"github.com/helm/monocular/src/api/swagger/models"
"github.com/kubernetes-helm/monocular/src/api/config"
"github.com/kubernetes-helm/monocular/src/api/swagger/models"
)

func TestDownloadAndExtractChartTarballOk(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion src/api/data/cache/charthelper/icon_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
log "github.com/Sirupsen/logrus"

"github.com/disintegration/imaging"
"github.com/helm/monocular/src/api/swagger/models"
"github.com/kubernetes-helm/monocular/src/api/swagger/models"
)

const originalFormat = "original"
Expand Down
2 changes: 1 addition & 1 deletion src/api/data/cache/charthelper/icon_helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
httpmock "gopkg.in/jarcoal/httpmock.v1"

"github.com/arschles/assert"
"github.com/helm/monocular/src/api/swagger/models"
"github.com/kubernetes-helm/monocular/src/api/swagger/models"
)

func TestDownloadAndProcessChartIconNoIcon(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions src/api/data/charts.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package data

import (
"github.com/helm/monocular/src/api/swagger/models"
"github.com/helm/monocular/src/api/swagger/restapi/operations/charts"
"github.com/kubernetes-helm/monocular/src/api/swagger/models"
"github.com/kubernetes-helm/monocular/src/api/swagger/restapi/operations/charts"
)

// Charts is an interface for managing chart data sourced from a repository index
Expand Down
2 changes: 1 addition & 1 deletion src/api/data/client.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package data

import releasesapi "github.com/helm/monocular/src/api/swagger/restapi/operations/releases"
import releasesapi "github.com/kubernetes-helm/monocular/src/api/swagger/restapi/operations/releases"
import rls "k8s.io/helm/pkg/proto/hapi/services"

// Client is an interface for managing Helm Chart releases
Expand Down
8 changes: 4 additions & 4 deletions src/api/data/helm/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import (
"fmt"

log "github.com/Sirupsen/logrus"
"github.com/helm/monocular/src/api/config"
"github.com/helm/monocular/src/api/data"
releasesapi "github.com/helm/monocular/src/api/swagger/restapi/operations/releases"
"github.com/kubernetes-helm/monocular/src/api/config"
"github.com/kubernetes-helm/monocular/src/api/data"
releasesapi "github.com/kubernetes-helm/monocular/src/api/swagger/restapi/operations/releases"
"k8s.io/helm/pkg/helm"
"k8s.io/helm/pkg/helm/portforwarder"
"k8s.io/helm/pkg/kube"
rls "k8s.io/helm/pkg/proto/hapi/services"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

helmreleases "github.com/helm/monocular/src/api/data/helm/releases"
helmreleases "github.com/kubernetes-helm/monocular/src/api/data/helm/releases"
"k8s.io/kubernetes/pkg/client/restclient"
)

Expand Down
2 changes: 1 addition & 1 deletion src/api/data/helm/releases/releases.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package releases

import (
log "github.com/Sirupsen/logrus"
releasesapi "github.com/helm/monocular/src/api/swagger/restapi/operations/releases"
releasesapi "github.com/kubernetes-helm/monocular/src/api/swagger/restapi/operations/releases"
"k8s.io/helm/pkg/helm"
"k8s.io/helm/pkg/proto/hapi/release"
"k8s.io/helm/pkg/proto/hapi/services"
Expand Down
8 changes: 4 additions & 4 deletions src/api/data/helpers/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (

"github.com/Masterminds/semver"
"github.com/ghodss/yaml"
"github.com/helm/monocular/src/api/config"
"github.com/helm/monocular/src/api/config/repos"
"github.com/helm/monocular/src/api/swagger/models"
"github.com/kubernetes-helm/monocular/src/api/config"
"github.com/kubernetes-helm/monocular/src/api/config/repos"
"github.com/kubernetes-helm/monocular/src/api/swagger/models"

"github.com/helm/monocular/src/api/data/cache/charthelper"
"github.com/kubernetes-helm/monocular/src/api/data/cache/charthelper"
)

// APIVer1String is the API version 1 string we include in route URLs
Expand Down
Loading

0 comments on commit bc3f212

Please sign in to comment.