Skip to content

Commit

Permalink
Merge pull request kubernetes-retired#16 from jpeeler/v0.1.25-rebase
Browse files Browse the repository at this point in the history
Rebase to v0.1.25
  • Loading branch information
openshift-merge-robot committed Jul 18, 2018
2 parents d085817 + 16f620f commit df2f4db
Show file tree
Hide file tree
Showing 1,239 changed files with 53,056 additions and 28,258 deletions.
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE.md
@@ -0,0 +1,21 @@
# Bug Report

**What happened**:

**What you expected to happen**:

**How to reproduce it (as minimally and precisely as possible)**:

**Anything else we need to know?**:

**Environment**:
- Kubernetes version (use `kubectl version`):
- service-catalog version:
- Cloud provider or hardware configuration:
- Do you have api aggregation enabled?
- Do you see the configmap in kube-system?
- Does it have all the necessary fields?
- `kubectl get cm -n kube-system extension-apiserver-authentication -o yaml` and look for `requestheader-XXX` fields
- Install tools:
- Did you use helm? What were the helm arguments? Did you `--set` any extra values?
- Are you trying to use ALPHA features? Did you enable them?
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -25,4 +25,6 @@ contrib/examples/consumer/Gopkg.lock
contrib/examples/consumer
contrib/examples/vendor/*
integration.test*
debug.test*

/_output
70 changes: 50 additions & 20 deletions .travis.yml
@@ -1,44 +1,69 @@
language: generic
env:
- GO_VERSION=1.9
- GO_VERSION=rc
matrix:
allow_failures:
- env: GO_VERSION=rc
fast_finish: true
notifications:
email: # We are using secure strings to workaround travis sending emails for forks
- secure: "JiJEb1Fm7YPbgOz6VOuJ/07PU/lyKK+v6yUrjEl9TiT6zApN6EHO+Q7Z8OcAN4Q6o11DSRrhYr3+eomXwu5VXiFBPUk0EI9Z1msx4z0Oi104gfS4Kna3b3PGgvFptm7cKPlByVL46rmNssukLoqIX7zU5ceBQ7nETJxan/fwfatQzPzFHksysNQPzCnuPdZLhzDiZuwIhINcEAA9/D4SI6nmS17v2wygo8oNSo2xV2kfgSxJFzUmgt55WA17Y5VyIkATyEfBRpvPAtvhNjrjQcUruX2EICJaEAmO/873z2uQbp3/REtpNFykSsNhC1sE77fZhiZ+vU94zjneEOVF+vJyAlRbBuV/HML00AsWF4gqHLsfoNguSAX7bS8rAr67bzw+6cB5eX3hkjSnY7q+75eipk3e8FO4p9RhdjidlQcLvvmj2URq48PsePIUPZhJVZBfgwwIuCvYDrAZPb9yHj3X5uGHveI6Wwl6o9dpxmTfnT3rLBON2LfOsHe/HRFNbI+EVtH10dP/oMq9SQOqX+C6chuy4kjMIqUDN/n+eVPhHCKpDuaNde0vSMt9ZB+YFHiGjXoV+YhYZEnY+/LZAUhZDyO/gm3aZ1PiFvPISCZ9oSthnkzKGI7O3SuBSokDvnkLtVJCOw61nOekcmKoHPAS8dVUms4FPJMPkOkujmM="
sudo: required
services:
- docker
cache:
directories:
- $GOPATH/pkg/dep
# ${GOPATH}/pkg is mounted in DOCKER_CMD in Makefile
- .pkg
# golang cache is mounted in DOCKER_CMD in Makefile
- .cache
stages:
- test
- name: deploy
if: type != pull_request
- name: push-chart
# require the tag name to match a regular expression
if: tag =~ ^v
before_install:
- |
if [[ -z "$TRAVIS_COMMIT_RANGE" ]]; then
# Builds triggered by initial commit of a new branch.
DOCS_ONLY=0
else
DOCS_REGEX='(OWNERS|LICENSE)|(\.md$)|(^docs/)'
DOCS_REGEX='(OWNERS|LICENSE)|(\.md$)|(^docs/)|(^docsite/)'
[[ -z "$(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -vE $DOCS_REGEX)" ]]
DOCS_ONLY=$?
fi
# Test
script:
- |
if (( $DOCS_ONLY == 0 )); then
echo "Running verify-docs"
make verify-docs
else
echo "Running full build"
make verify build build-integration build-e2e test images svcat-all
fi
jobs:
fast_finish: true
include:
# Test is implicit from the build matrix
# CI Build
- stage: test
script:
- |
if (( $DOCS_ONLY == 0 )); then
echo "Running verify-docs"
make verify-docs
else
echo "Running full build"
make verify build svcat build-integration build-e2e test
fi
env: GO_VERSION=1.10
# Cross Build Check
- stage: test
script:
- |
if (( $DOCS_ONLY != 0 )); then
make images-all
fi
env: XBUILD_SERVER=true
- stage: test
script:
- |
if (( $DOCS_ONLY != 0 )); then
make svcat-all
fi
env: XBUILD_CLIENT=true
# Doc Site svc-cat.io
- stage: test
script:
- |
make docs
env: DOCS=true
# Deploy
- stage: deploy
script: skip
Expand All @@ -49,3 +74,8 @@ jobs:
on:
repo: kubernetes-incubator/service-catalog
all_branches: true
- stage: push-chart
script:
- |
openssl aes-256-cbc -K $encrypted_8471c4fb0720_key -iv $encrypted_8471c4fb0720_iv -in contrib/travis/gcloud-key-file.json.enc -out contrib/travis/gcloud-key-file.json -d
test/repo-sync.sh

0 comments on commit df2f4db

Please sign in to comment.