Skip to content

Commit

Permalink
Updater operator dependencies to use v1 Ingress (#231)
Browse files Browse the repository at this point in the history
* Upgraded operator sdk to 0.19 to use networking/v1 apis

* Added pathType to all ingress routes

* Format files

Co-authored-by: Joe Stanley <Joe.Stanley@ibm.com>
  • Loading branch information
joewstanley and jwstanl3 authored Aug 3, 2021
1 parent 2beae39 commit 0098d70
Show file tree
Hide file tree
Showing 7 changed files with 850 additions and 429 deletions.
2 changes: 0 additions & 2 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import (
"github.com/operator-framework/operator-sdk/pkg/leader"
"github.com/operator-framework/operator-sdk/pkg/log/zap"
"github.com/operator-framework/operator-sdk/pkg/metrics"
"github.com/operator-framework/operator-sdk/pkg/restmapper"
sdkVersion "github.com/operator-framework/operator-sdk/version"
"github.com/spf13/pflag"
v1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -111,7 +110,6 @@ func main() {
// Create a new Cmd to provide shared dependencies and start components
mgr, err := manager.New(cfg, manager.Options{
Namespace: namespace,
MapperProvider: restmapper.NewDynamicRESTMapper,
MetricsBindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
})
if err != nil {
Expand Down
63 changes: 33 additions & 30 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,45 @@ module github.com/ibm/ibm-commonui-operator
go 1.13

require (
github.com/go-openapi/spec v0.19.2
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
github.com/go-openapi/spec v0.19.3
github.com/jetstack/cert-manager v0.10.1
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
github.com/operator-framework/operator-sdk v0.13.0
github.com/operator-framework/operator-sdk v0.19.0
github.com/spf13/pflag v1.0.5
k8s.io/api v0.0.0
k8s.io/apiextensions-apiserver v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.20.2
k8s.io/apiextensions-apiserver v0.20.1
k8s.io/apimachinery v0.21.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
sigs.k8s.io/controller-runtime v0.4.0
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
sigs.k8s.io/controller-runtime v0.7.2
)

// Pinned to kubernetes-1.16.2
replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.4-0.20200207053602-7439e774c9e9+incompatible
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
k8s.io/api => k8s.io/api v0.0.0-20191016110408-35e52d86657a
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191016112112-5190913f932d
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191016115326-20453efc2458
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191016115129-c07a134afb42
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
k8s.io/component-base => k8s.io/component-base v0.0.0-20191016111319-039242c015a9
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191016115521-756ffa5af0bd
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191016112429-9587704a8ad4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191016114939-2b2b218dc1df
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191016114407-2e83b6f20229
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191016114748-65049c67a58b
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191016114556-7841ed97f1b2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191016115753-cf0698c3a16b
k8s.io/metrics => k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191016112829-06bb3c9d77c9
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.1
github.com/prometheus-operator/prometheus-operator => github.com/prometheus-operator/prometheus-operator v0.38.0 // indirect
k8s.io/api => k8s.io/api v0.19.10
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.10
k8s.io/apimachinery => k8s.io/apimachinery v0.19.10
k8s.io/apiserver => k8s.io/apiserver v0.19.10
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.10
k8s.io/client-go => github.com/kubernetes/client-go v0.19.10
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.10
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.10
k8s.io/code-generator => k8s.io/code-generator v0.19.10
k8s.io/component-base => k8s.io/component-base v0.19.10
k8s.io/cri-api => k8s.io/cri-api v0.19.10
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.10
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.10
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.10
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.10
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.10
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.7.2
k8s.io/kubectl => k8s.io/kubectl v0.19.10
k8s.io/kubelet => k8s.io/kubelet v0.19.10
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.10
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.10
)

replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
Loading

0 comments on commit 0098d70

Please sign in to comment.