Skip to content

Commit

Permalink
Updated k8s libs
Browse files Browse the repository at this point in the history
  • Loading branch information
@psav
psav committed Dec 15, 2021
1 parent 9d95474 commit 0cfc240
Show file tree
Hide file tree
Showing 9 changed files with 223 additions and 291 deletions.
2 changes: 1 addition & 1 deletion apis/cloud.redhat.com/v1alpha1/clowdapp_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"

"github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1/common"
keda "github.com/kedacore/keda/v2/api/v1alpha1"
keda "github.com/kedacore/keda/v2/apis/keda/v1alpha1"
batch "k8s.io/api/batch/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
8 changes: 4 additions & 4 deletions apis/cloud.redhat.com/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion controllers/cloud.redhat.com/providers/autoscaler/default.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/config"
p "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers"
rc "github.com/RedHatInsights/rhc-osdk-utils/resource_cache"
keda "github.com/kedacore/keda/v2/api/v1alpha1"
keda "github.com/kedacore/keda/v2/apis/keda/v1alpha1"
)

type autoscalerProvider struct {
Expand Down
2 changes: 1 addition & 1 deletion controllers/cloud.redhat.com/providers/autoscaler/impl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
crd "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/config"
deployProvider "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/deployment"
keda "github.com/kedacore/keda/v2/api/v1alpha1"
keda "github.com/kedacore/keda/v2/apis/keda/v1alpha1"
apps "k8s.io/api/apps/v1"
"k8s.io/apimachinery/pkg/types"
)
Expand Down
2 changes: 1 addition & 1 deletion controllers/cloud.redhat.com/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
cloudredhatcomv1alpha1 "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
cyndi "github.com/RedHatInsights/cyndi-operator/api/v1alpha1"
strimzi "github.com/RedHatInsights/strimzi-client-go/apis/kafka.strimzi.io/v1beta2"
keda "github.com/kedacore/keda/v2/api/v1alpha1"
keda "github.com/kedacore/keda/v2/apis/keda/v1alpha1"
prom "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"

"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion controllers/cloud.redhat.com/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
crd "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/config"
strimzi "github.com/RedHatInsights/strimzi-client-go/apis/kafka.strimzi.io/v1beta2"
keda "github.com/kedacore/keda/v2/api/v1alpha1"
keda "github.com/kedacore/keda/v2/apis/keda/v1alpha1"
// +kubebuilder:scaffold:imports
)

Expand Down
2 changes: 1 addition & 1 deletion docs/antora/modules/ROOT/pages/api_reference.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ AutoScaler defines the autoscaling parameters of a KEDA ScaledObject targeting t
| *`cooldownPeriod`* __integer__ | CooldownPeriod is the interval (in seconds) to wait after the last trigger reported active before scaling the deployment down. Default is 5 minutes (300 seconds).
| *`maxReplicaCount`* __integer__ | MaxReplicaCount is the maximum number of replicas the scaler will scale the deployment to. Default is 10.
| *`advanced`* __AdvancedConfig__ |
| *`triggers`* __xref:{anchor_prefix}-github-com-kedacore-keda-v2-api-v1alpha1-scaletriggers[$$ScaleTriggers$$] array__ |
| *`triggers`* __xref:{anchor_prefix}-github-com-kedacore-keda-v2-apis-keda-v1alpha1-scaletriggers[$$ScaleTriggers$$] array__ |
| *`fallback`* __Fallback__ |
|===

Expand Down
20 changes: 9 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,20 @@ require (
github.com/RedHatInsights/strimzi-client-go v0.24.0-1
github.com/go-logr/logr v0.4.0
github.com/go-logr/zapr v0.4.0
github.com/kedacore/keda/v2 v2.4.0
github.com/lib/pq v1.10.3
github.com/kedacore/keda/v2 v2.5.0
github.com/lib/pq v1.10.4
github.com/minio/minio-go/v7 v7.0.10
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.16.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.17.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.47.1
github.com/prometheus/client_golang v1.11.0
github.com/segmentio/kafka-go v0.4.16
github.com/stretchr/testify v1.7.0
go.uber.org/zap v1.19.0
k8s.io/api v0.22.2
k8s.io/apiextensions-apiserver v0.22.2
k8s.io/apimachinery v0.22.2
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
go.uber.org/zap v1.19.1
k8s.io/api v0.22.4
k8s.io/apiextensions-apiserver v0.22.4
k8s.io/apimachinery v0.22.4
k8s.io/client-go v0.22.4
sigs.k8s.io/cluster-api v1.0.1
sigs.k8s.io/controller-runtime v0.10.3
)

replace k8s.io/client-go => k8s.io/client-go v0.22.1
Loading

0 comments on commit 0cfc240

Please sign in to comment.