Skip to content
Open
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
63 changes: 43 additions & 20 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
version: 2
version: 2.1
orbs:
minikube: ccpgames/minikube@0.0.1

yaml-templates:
branch_filters: &branch_filters
filters:
Expand Down Expand Up @@ -45,38 +48,42 @@ workflows:
jobs:
- build-linux-386:
<<: *release_filters
- build-linux-amd64:
<<: *branch_filters
#- build-linux-amd64:
#<<: *branch_filters
- build-darwin-386:
<<: *release_filters
- build-darwin-amd64:
<<: *branch_filters
#- build-darwin-amd64:
#<<: *branch_filters
- build-windows-386:
<<: *release_filters
- build-windows-amd64:
<<: *branch_filters
- build-linux-arm:
<<: *release_filters
- build-linux-arm64:
<<: *release_filters
#- build-linux-arm:
#<<: *release_filters
#- build-linux-arm64:
#<<: *release_filters
- test:
<<: *branch_filters
- smoke_test:
#- smoke_test:
#<<: *branch_filters
- http_example_test:
<<: *branch_filters

- publish-github-release:
<<: *release_filters
requires:
- build-linux-386
- build-linux-amd64
- build-darwin-386
- build-darwin-amd64
- build-windows-386
- build-windows-amd64
- build-linux-arm
- build-linux-arm64
- test
- smoke_test
#- build-linux-386
#- build-linux-amd64
#- build-darwin-386
#- build-darwin-amd64
#- build-windows-386
#- build-windows-amd64
#- build-linux-arm
#- build-linux-arm64
#- test
#- smoke_test
#
- http_example_test

jobs:
build-linux-amd64: &go_build
Expand Down Expand Up @@ -197,6 +204,22 @@ jobs:
name: Run Tests
command: ./skupper_smoke #set kubeconfig as parameter if needed

http_example_test:
machine: true
environment: &environment
steps:
- run:
name: export
command: |
echo 'export KUBECONFIG=/home/circleci/.kube/config' >> $BASH_ENV #not needed?
source $BASH_ENV
- checkout
- minikube/initialize
#clone the example
- run:
name: cluster info
command: kubectl cluster-info

publish-github-release:
docker:
- image: cibuilds/github:0.10
Expand Down
2 changes: 2 additions & 0 deletions cmd/skupper/skupper.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/runtime/serializer/json"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/client-go/discovery"
Expand Down Expand Up @@ -2695,6 +2696,7 @@ func initKubeConfig(options *KubeOptions) *KubeDetails {

restconfig.ContentConfig.GroupVersion = &schema.GroupVersion{Version:"v1"}
restconfig.APIPath = "/api"
restconfig.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: scheme.Codecs}
details.RestConfig = restconfig
details.Standard, err = kubernetes.NewForConfig(restconfig)
if err != nil {
Expand Down