Update dependencies (#683)

Signed-off-by: Tamal Saha <[email protected]>

go.mod

@@ -20,10 +20,10 @@ require (
 	k8s.io/klog/v2 v2.80.1
 	k8s.io/kubectl v0.25.1
 	kmodules.xyz/client-go v0.25.6
-	kmodules.xyz/custom-resources v0.25.0
+	kmodules.xyz/custom-resources v0.25.1
 	kmodules.xyz/monitoring-agent-api v0.25.0
-	kubedb.dev/apimachinery v0.28.4-0.20220924164625-f5eabfc23811
-	stash.appscode.dev/apimachinery v0.22.1-0.20220924053358-8821fa34c13f
+	kubedb.dev/apimachinery v0.28.4-0.20221007091615-35e1d5e5bcb6
+	stash.appscode.dev/apimachinery v0.23.0
 )
 
 require (

go.sum

@@ -987,8 +987,8 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
 kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
 kmodules.xyz/client-go v0.25.6 h1:59mMNoanKrqOFYqDMtqYU5caFxd+7YrfNqpvyKYWqNE=
 kmodules.xyz/client-go v0.25.6/go.mod h1:NgLAVr+IEAFpI9g7FhZF5qG0SG+SBADxknWu5jp0m8M=
-kmodules.xyz/custom-resources v0.25.0 h1:5JQTEuiv6lC/+VVFNKqzfX4YtJCmN5E7mcNtGnHGVQM=
-kmodules.xyz/custom-resources v0.25.0/go.mod h1:ULwzvLmOqZJcPSXKI7iLclYL5eYRlKx8Nbex28Ht19E=
+kmodules.xyz/custom-resources v0.25.1 h1:0qHPTxbT/q0afl2GCOnwPFaoxKziRIPXgVu77YwrCa4=
+kmodules.xyz/custom-resources v0.25.1/go.mod h1:ULwzvLmOqZJcPSXKI7iLclYL5eYRlKx8Nbex28Ht19E=
 kmodules.xyz/monitoring-agent-api v0.25.0 h1:RU9RBeCqQdoS381xXy8cM1aqT+7qmtuPI3KxNQoX16Y=
 kmodules.xyz/monitoring-agent-api v0.25.0/go.mod h1:RH5f/W9eCiW+KTblBIh8MZkjCWdtMQ8MuzCBMfgkynM=
 kmodules.xyz/objectstore-api v0.25.0 h1:xT7+SXBqAMtVkfOdp4espHAfZ6MYUC4G1OgzTkURNnU=
@@ -997,8 +997,8 @@ kmodules.xyz/offshoot-api v0.25.0 h1:Svq9da/+sg5afOjpgo9vx2J/Lu90Mo0aFxkdQmgKnGI
 kmodules.xyz/offshoot-api v0.25.0/go.mod h1:ysEBn7LJuT3+s8ynAQA/OG0BSsJugXa6KGtDLMRjlKo=
 kmodules.xyz/prober v0.25.0 h1:R5uRLHJEvEtEoogj+vaTAob0Btph6+PX5IlS6hPh8PA=
 kmodules.xyz/prober v0.25.0/go.mod h1:z4RTnjaajNQa/vPltsiOnO3xI716I/ziD2ac2Exm+1M=
-kubedb.dev/apimachinery v0.28.4-0.20220924164625-f5eabfc23811 h1:Xp/vSFvwHclqLrJ+SRXXHCwTxICUv9OdL6WJaD/2gxc=
-kubedb.dev/apimachinery v0.28.4-0.20220924164625-f5eabfc23811/go.mod h1:BNR4wQVfhzoucxS8MNcH0zcpDcYelXwqsevnPBxtIo0=
+kubedb.dev/apimachinery v0.28.4-0.20221007091615-35e1d5e5bcb6 h1:zrlfmcSezG2O94V8tc7E8GpWZvJEU9wMrjLauaD1Wfw=
+kubedb.dev/apimachinery v0.28.4-0.20221007091615-35e1d5e5bcb6/go.mod h1:8/kV/429eH4DlQ24vwRaxkf1mMhN6FL/nvuPEJt2CYc=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
@@ -1012,5 +1012,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kF
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
-stash.appscode.dev/apimachinery v0.22.1-0.20220924053358-8821fa34c13f h1:N2jMJ6yOvgveZSHzlNpXZCbp8QFPACiqdOKXLcJIV6k=
-stash.appscode.dev/apimachinery v0.22.1-0.20220924053358-8821fa34c13f/go.mod h1:Tb1y/+h1r3+YdBvI5RYIC0tW1b8S+0pIb3iG0X7BOjo=
+stash.appscode.dev/apimachinery v0.23.0 h1:wEOxoVsnF7LtOFxgQyvW+5dlVe8bw6kLhUm2LrQM41s=
+stash.appscode.dev/apimachinery v0.23.0/go.mod h1:Tb1y/+h1r3+YdBvI5RYIC0tW1b8S+0pIb3iG0X7BOjo=

pkg/restarter/elasticsearch.go

@@ -68,7 +68,7 @@ func (e *ElasticsearchRestarter) Restart(name, namespace string) (string, error)
 			Namespace: namespace,
 		},
 		Spec: v1alpha1.ElasticsearchOpsRequestSpec{
-			Type: v1alpha1.OpsRequestTypeRestart,
+			Type: v1alpha1.ElasticsearchOpsRequestTypeRestart,
 			DatabaseRef: v1.LocalObjectReference{
 				Name: name,
 			},

pkg/restarter/mariadb.go

@@ -68,7 +68,7 @@ func (e *MariaDBRestarter) Restart(name, namespace string) (string, error) {
 			Namespace: namespace,
 		},
 		Spec: v1alpha1.MariaDBOpsRequestSpec{
-			Type: v1alpha1.OpsRequestTypeRestart,
+			Type: v1alpha1.MariaDBOpsRequestTypeRestart,
 			DatabaseRef: v1.LocalObjectReference{
 				Name: name,
 			},

pkg/restarter/mongodb.go

@@ -68,7 +68,7 @@ func (e *MongoDBRestarter) Restart(name, namespace string) (string, error) {
 			Namespace: namespace,
 		},
 		Spec: v1alpha1.MongoDBOpsRequestSpec{
-			Type: v1alpha1.OpsRequestTypeRestart,
+			Type: v1alpha1.MongoDBOpsRequestTypeRestart,
 			DatabaseRef: v1.LocalObjectReference{
 				Name: name,
 			},

pkg/restarter/mysql.go

@@ -69,7 +69,7 @@ func (e *MySQLRestarter) Restart(name, namespace string) (string, error) {
 			Namespace: namespace,
 		},
 		Spec: v1alpha1.MySQLOpsRequestSpec{
-			Type: v1alpha1.OpsRequestTypeRestart,
+			Type: v1alpha1.MySQLOpsRequestTypeRestart,
 			DatabaseRef: v1.LocalObjectReference{
 				Name: name,
 			},

pkg/restarter/postgres.go

@@ -68,7 +68,7 @@ func (e *PostgresRestarter) Restart(name, namespace string) (string, error) {
 			Namespace: namespace,
 		},
 		Spec: v1alpha1.PostgresOpsRequestSpec{
-			Type: v1alpha1.OpsRequestTypeRestart,
+			Type: v1alpha1.PostgresOpsRequestTypeRestart,
 			DatabaseRef: v1.LocalObjectReference{
 				Name: name,
 			},

pkg/restarter/redis.go

@@ -68,7 +68,7 @@ func (e *RedisRestarter) Restart(name, namespace string) (string, error) {
 			Namespace: namespace,
 		},
 		Spec: v1alpha1.RedisOpsRequestSpec{
-			Type: v1alpha1.OpsRequestTypeRestart,
+			Type: v1alpha1.RedisOpsRequestTypeRestart,
 			DatabaseRef: v1.LocalObjectReference{
 				Name: name,
 			},

vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/appbinding_types.go

@@ -17,6 +17,8 @@ limitations under the License.
 package v1alpha1
 
 import (
+	kmapi "kmodules.xyz/client-go/api/v1"
+
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -42,31 +44,35 @@ const (
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 type AppBinding struct {
 	metav1.TypeMeta   `json:",inline,omitempty"`
-	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
-	Spec              AppBindingSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              AppBindingSpec `json:"spec,omitempty"`
 }
 
 // AppBindingSpec is the spec for app
 type AppBindingSpec struct {
 	// Type used to facilitate programmatic handling of application.
 	// +optional
-	Type AppType `json:"type,omitempty" protobuf:"bytes,1,opt,name=type,casttype=AppType"`
+	Type AppType `json:"type,omitempty"`
+
+	// Reference to underlying application
+	// +optional
+	AppRef *kmapi.TypedObjectReference `json:"appRef,omitempty"`
 
 	// Version used to facilitate programmatic handling of application.
 	// +optional
-	Version string `json:"version,omitempty" protobuf:"bytes,2,opt,name=version"`
+	Version string `json:"version,omitempty"`
 
 	// ClientConfig defines how to communicate with the app.
 	// Required
-	ClientConfig ClientConfig `json:"clientConfig" protobuf:"bytes,3,opt,name=clientConfig"`
+	ClientConfig ClientConfig `json:"clientConfig"`
 
 	// Secret is the name of the secret to create in the AppBinding's
 	// namespace that will hold the credentials associated with the AppBinding.
-	Secret *core.LocalObjectReference `json:"secret,omitempty" protobuf:"bytes,4,opt,name=secret"`
+	Secret *core.LocalObjectReference `json:"secret,omitempty"`
 
 	// List of transformations that should be applied to the credentials
 	// associated with the ServiceBinding before they are inserted into the Secret.
-	SecretTransforms []SecretTransform `json:"secretTransforms,omitempty" protobuf:"bytes,5,rep,name=secretTransforms"`
+	SecretTransforms []SecretTransform `json:"secretTransforms,omitempty"`
 
 	// Parameters is a set of the parameters to be used to connect to the
 	// app. The inline YAML/JSON payload to be translated into equivalent
@@ -80,11 +86,11 @@ type AppBindingSpec struct {
 	// +optional
 	// +kubebuilder:validation:EmbeddedResource
 	// +kubebuilder:pruning:PreserveUnknownFields
-	Parameters *runtime.RawExtension `json:"parameters,omitempty" protobuf:"bytes,6,opt,name=parameters"`
+	Parameters *runtime.RawExtension `json:"parameters,omitempty"`
 
 	// TLSSecret is the name of the secret that will hold
 	// the client certificate and private key associated with the AppBinding.
-	TLSSecret *core.LocalObjectReference `json:"tlsSecret,omitempty" protobuf:"bytes,7,opt,name=tlsSecret"`
+	TLSSecret *core.LocalObjectReference `json:"tlsSecret,omitempty"`
 }
 
 type AppType string
@@ -115,78 +121,78 @@ type ClientConfig struct {
 	// allowed, either.
 	//
 	// +optional
-	URL *string `json:"url,omitempty" protobuf:"bytes,1,opt,name=url"`
+	URL *string `json:"url,omitempty"`
 
 	// `service` is a reference to the service for this app. Either
 	// `service` or `url` must be specified.
 	//
 	// If the webhook is running within the cluster, then you should use `service`.
 	//
 	// +optional
-	Service *ServiceReference `json:"service,omitempty" protobuf:"bytes,2,opt,name=service"`
+	Service *ServiceReference `json:"service,omitempty"`
 
 	// InsecureSkipTLSVerify disables TLS certificate verification when communicating with this app.
 	// This is strongly discouraged.  You should use the CABundle instead.
-	InsecureSkipTLSVerify bool `json:"insecureSkipTLSVerify,omitempty" protobuf:"varint,3,opt,name=insecureSkipTLSVerify"`
+	InsecureSkipTLSVerify bool `json:"insecureSkipTLSVerify,omitempty"`
 
 	// CABundle is a PEM encoded CA bundle which will be used to validate the serving certificate of this app.
 	// +optional
-	CABundle []byte `json:"caBundle,omitempty" protobuf:"bytes,4,opt,name=caBundle"`
+	CABundle []byte `json:"caBundle,omitempty"`
 
 	// ServerName is used to verify the hostname on the returned
 	// certificates unless InsecureSkipVerify is given. It is also included
 	// in the client's handshake to support virtual hosting unless it is
 	// an IP address.
-	ServerName string `json:"serverName,omitempty" protobuf:"bytes,5,opt,name=serverName"`
+	ServerName string `json:"serverName,omitempty"`
 }
 
 // ServiceReference holds a reference to Service.legacy.k8s.io
 type ServiceReference struct {
 	// Specifies which scheme to use, for example: http, https
 	// If specified, then it will applied as prefix in this format: scheme://
 	// If not specified, then nothing will be prefixed
-	Scheme string `json:"scheme" protobuf:"bytes,1,opt,name=scheme"`
+	Scheme string `json:"scheme"`
 
 	// `namespace` is the namespace of the service.
 	// +optional
-	Namespace string `json:"namespace,omitempty" protobuf:"bytes,2,opt,name=namespace"`
+	Namespace string `json:"namespace,omitempty"`
 
 	// `name` is the name of the service.
 	// Required
-	Name string `json:"name" protobuf:"bytes,3,opt,name=name"`
+	Name string `json:"name"`
 
 	// The port that will be exposed by this app.
-	Port int32 `json:"port" protobuf:"varint,4,opt,name=port"`
+	Port int32 `json:"port"`
 
 	// `path` is an optional URL path which will be sent in any request to
 	// this service.
 	// +optional
-	Path string `json:"path,omitempty" protobuf:"bytes,5,opt,name=path"`
+	Path string `json:"path,omitempty"`
 
 	// `query` is optional encoded query string, without '?' which will be
 	// sent in any request to this service.
 	// +optional
-	Query string `json:"query,omitempty" protobuf:"bytes,6,opt,name=query"`
+	Query string `json:"query,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // AppBindingList is a list of Apps
 type AppBindingList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+	metav1.ListMeta `json:"metadata,omitempty"`
 	// Items is a list of AppBinding CRD objects
-	Items []AppBinding `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"`
+	Items []AppBinding `json:"items,omitempty"`
 }
 
 type AppReference struct {
 	// `namespace` is the namespace of the app.
 	// Required
-	Namespace string `json:"namespace" protobuf:"bytes,1,opt,name=namespace"`
+	Namespace string `json:"namespace"`
 
 	// `name` is the name of the app.
 	// Required
-	Name string `json:"name" protobuf:"bytes,2,opt,name=name"`
+	Name string `json:"name"`
 
 	// Parameters is a set of the parameters to be used to override default
 	// parameters. The inline YAML/JSON payload to be translated into equivalent
@@ -198,7 +204,7 @@ type AppReference struct {
 	// +optional
 	// +kubebuilder:validation:EmbeddedResource
 	// +kubebuilder:pruning:PreserveUnknownFields
-	Parameters *runtime.RawExtension `json:"parameters,omitempty" protobuf:"bytes,3,opt,name=parameters"`
+	Parameters *runtime.RawExtension `json:"parameters,omitempty"`
 }
 
 type AppBindingMeta interface {
@@ -210,9 +216,9 @@ type AppBindingMeta interface {
 // referenced object.
 type ObjectReference struct {
 	// Namespace of the referent.
-	Namespace string `json:"namespace,omitempty" protobuf:"bytes,1,opt,name=namespace"`
+	Namespace string `json:"namespace,omitempty"`
 	// Name of the referent.
-	Name string `json:"name,omitempty" protobuf:"bytes,2,opt,name=name"`
+	Name string `json:"name,omitempty"`
 }
 
 // ref: https://github.com/kubernetes-sigs/service-catalog/blob/37b874716ad709a175e426f5f5638322a600849f/pkg/apis/servicecatalog/v1beta1/types.go#L1397
@@ -233,14 +239,14 @@ type ObjectReference struct {
 // Only one of the SecretTransform's members may be specified.
 type SecretTransform struct {
 	// RenameKey represents a transform that renames a credentials Secret entry's key
-	RenameKey *RenameKeyTransform `json:"renameKey,omitempty" protobuf:"bytes,1,opt,name=renameKey"`
+	RenameKey *RenameKeyTransform `json:"renameKey,omitempty"`
 	// AddKey represents a transform that adds an additional key to the credentials Secret
-	AddKey *AddKeyTransform `json:"addKey,omitempty" protobuf:"bytes,2,opt,name=addKey"`
+	AddKey *AddKeyTransform `json:"addKey,omitempty"`
 	// AddKeysFrom represents a transform that merges all the entries of an existing Secret
 	// into the credentials Secret
-	AddKeysFrom *AddKeysFromTransform `json:"addKeysFrom,omitempty" protobuf:"bytes,3,opt,name=addKeysFrom"`
+	AddKeysFrom *AddKeysFromTransform `json:"addKeysFrom,omitempty"`
 	// RemoveKey represents a transform that removes a credentials Secret entry
-	RemoveKey *RemoveKeyTransform `json:"removeKey,omitempty" protobuf:"bytes,4,opt,name=removeKey"`
+	RemoveKey *RemoveKeyTransform `json:"removeKey,omitempty"`
 }
 
 // RenameKeyTransform specifies that one of the credentials keys returned
@@ -259,9 +265,9 @@ type SecretTransform struct {
 //	"DB_USER": "johndoe"
 type RenameKeyTransform struct {
 	// The name of the key to rename
-	From string `json:"from" protobuf:"bytes,1,opt,name=from"`
+	From string `json:"from"`
 	// The new name for the key
-	To string `json:"to" protobuf:"bytes,2,opt,name=to"`
+	To string `json:"to"`
 }
 
 // AddKeyTransform specifies that Service Catalog should add an
@@ -279,14 +285,14 @@ type RenameKeyTransform struct {
 // AddKeysFromTransform should be used instead.
 type AddKeyTransform struct {
 	// The name of the key to add
-	Key string `json:"key" protobuf:"bytes,1,opt,name=key"`
+	Key string `json:"key"`
 	// The binary value (possibly non-string) to add to the Secret under the specified key. If both
 	// value and stringValue are specified, then value is ignored and stringValue is stored.
 	// +optional
-	Value []byte `json:"value,omitempty" protobuf:"bytes,2,opt,name=value"`
+	Value []byte `json:"value,omitempty"`
 	// The string (non-binary) value to add to the Secret under the specified key.
 	// +optional
-	StringValue *string `json:"stringValue,omitempty" protobuf:"bytes,3,opt,name=stringValue"`
+	StringValue *string `json:"stringValue,omitempty"`
 }
 
 // AddKeysFromTransform specifies that Service Catalog should merge
@@ -299,12 +305,12 @@ type AddKeyTransform struct {
 // the credentials Secret.
 type AddKeysFromTransform struct {
 	// The reference to the Secret that should be merged into the credentials Secret.
-	SecretRef *core.LocalObjectReference `json:"secretRef,omitempty" protobuf:"bytes,1,opt,name=secretRef"`
+	SecretRef *core.LocalObjectReference `json:"secretRef,omitempty"`
 }
 
 // RemoveKeyTransform specifies that one of the credentials keys returned
 // from the broker should not be included in the credentials Secret.
 type RemoveKeyTransform struct {
 	// The key to remove from the Secret
-	Key string `json:"key" protobuf:"bytes,1,opt,name=key"`
+	Key string `json:"key"`
 }