Skip to content
This repository was archived by the owner on May 28, 2021. It is now read-only.

update statefulset from app/sv1beta1 to apps/v1 #308

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
710 changes: 0 additions & 710 deletions Gopkg.lock

This file was deleted.

93 changes: 0 additions & 93 deletions Gopkg.toml

This file was deleted.

8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ build: dist build-dirs Makefile
.PHONY: build-docker
build-docker:
@docker build \
--build-arg=http_proxy \
--build-arg=https_proxy \
-t $(REGISTRY)/$(TENANT)/mysql-operator:$(VERSION) \
-f docker/mysql-operator/Dockerfile .
--build-arg=http_proxy \
--build-arg=https_proxy \
-t $(REGISTRY)/$(TENANT)/mysql-operator:$(VERSION) \
-f docker/mysql-operator/Dockerfile .

@docker build \
--build-arg=http_proxy \
Expand Down
2 changes: 1 addition & 1 deletion cmd/mysql-agent/app/mysql_agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"sync"
"time"

"github.com/golang/glog"
"github.com/heptiolabs/healthcheck"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
glog "k8s.io/klog"

kubeinformers "k8s.io/client-go/informers"
kubernetes "k8s.io/client-go/kubernetes"
Expand Down
9 changes: 5 additions & 4 deletions cmd/mysql-agent/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ import (
"fmt"
"os"

utilflag "k8s.io/apiserver/pkg/util/flag"
"k8s.io/apiserver/pkg/util/logs"
cliflag "k8s.io/component-base/cli/flag"

"k8s.io/kubectl/pkg/util/logs"

"github.com/golang/glog"
"github.com/spf13/pflag"
glog "k8s.io/klog"

"github.com/oracle/mysql-operator/cmd/mysql-agent/app"
agentopts "github.com/oracle/mysql-operator/pkg/options/agent"
Expand All @@ -36,7 +37,7 @@ func main() {
opts := agentopts.NewMySQLAgentOpts()

opts.AddFlags(pflag.CommandLine)
pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
pflag.Parse()
goflag.CommandLine.Parse([]string{})
Expand Down
4 changes: 2 additions & 2 deletions cmd/mysql-operator/app/mysql_operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"sync"
"time"

"github.com/golang/glog"
"github.com/prometheus/client_golang/prometheus"
glog "k8s.io/klog"

kubeinformers "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes"
Expand Down Expand Up @@ -84,7 +84,7 @@ func Run(s *operatoropts.MySQLOperatorOpts) error {
mysqlopClient,
kubeClient,
operatorInformerFactory.MySQL().V1alpha1().Clusters(),
kubeInformerFactory.Apps().V1beta1().StatefulSets(),
kubeInformerFactory.Apps().V1().StatefulSets(),
kubeInformerFactory.Core().V1().Pods(),
kubeInformerFactory.Core().V1().Services(),
30*time.Second,
Expand Down
8 changes: 4 additions & 4 deletions cmd/mysql-operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"fmt"
"os"

"github.com/golang/glog"
"github.com/spf13/pflag"
utilflag "k8s.io/apiserver/pkg/util/flag"
cliflag "k8s.io/component-base/cli/flag"
glog "k8s.io/klog"

"k8s.io/apiserver/pkg/util/logs"
"k8s.io/kubectl/pkg/util/logs"

"github.com/oracle/mysql-operator/cmd/mysql-operator/app"
operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
Expand All @@ -45,7 +45,7 @@ func main() {
}

opts.AddFlags(pflag.CommandLine)
pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
pflag.Parse()
goflag.CommandLine.Parse([]string{})
Expand Down
53 changes: 53 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
module github.com/oracle/mysql-operator

go 1.13

require (
github.com/aws/aws-sdk-go v1.29.4
github.com/coreos/go-semver v0.3.0
github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4
github.com/golang/groupcache v0.0.0-20171101203131-84a468cf14b4 // indirect
github.com/heptiolabs/healthcheck v0.0.0-20171103213001-9926c14869d1
github.com/onsi/ginkgo v1.10.1
github.com/onsi/gomega v1.7.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v0.9.2
github.com/robfig/cron v1.2.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
k8s.io/component-base v0.0.0-20191016111319-039242c015a9
k8s.io/klog v0.4.0
k8s.io/kubectl v0.0.0-00010101000000-000000000000
k8s.io/utils v0.0.0-20190801114015-581e00157fb1
)

// Pinned to kubernetes-1.16.2
replace (
// github.com/docker/docker => github.com/docker/docker v1.4.2-0.20170504205632-89658bed64c2
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
)
Loading