Skip to content

Commit 5a961ac

Browse files
author
Mengqi Yu
committed
fix bazel build issues
1 parent 8bfde6c commit 5a961ac

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

pkg/admission/cert/writer/secret.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/runtime"
3030
"k8s.io/apimachinery/pkg/types"
31-
apitypes "k8s.io/apimachinery/pkg/types"
3231
"k8s.io/client-go/kubernetes/scheme"
3332
"sigs.k8s.io/controller-runtime/pkg/admission/cert/generator"
3433
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -129,7 +128,7 @@ type secretReadWriter struct {
129128

130129
type webhookAndSecret struct {
131130
webhook *admissionregistrationv1beta1.Webhook
132-
secret apitypes.NamespacedName
131+
secret types.NamespacedName
133132
}
134133

135134
var _ certReadWriter = &secretReadWriter{}
@@ -194,7 +193,7 @@ func secretToCerts(secret *corev1.Secret) *generator.Artifacts {
194193
}
195194
}
196195

197-
func certsToSecret(certs *generator.Artifacts, sec apitypes.NamespacedName) *corev1.Secret {
196+
func certsToSecret(certs *generator.Artifacts, sec types.NamespacedName) *corev1.Secret {
198197
return &corev1.Secret{
199198
ObjectMeta: metav1.ObjectMeta{
200199
Namespace: sec.Namespace,

pkg/controller/controllerutil/controllerutil_test.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package controllerutil
1+
package controllerutil_test
22

33
import (
44
. "github.com/onsi/ginkgo"
@@ -8,6 +8,7 @@ import (
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
99
"k8s.io/apimachinery/pkg/runtime"
1010
"k8s.io/client-go/kubernetes/scheme"
11+
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
1112
)
1213

1314
var _ = Describe("Controllerutil", func() {
@@ -18,7 +19,7 @@ var _ = Describe("Controllerutil", func() {
1819
ObjectMeta: metav1.ObjectMeta{Name: "foo", UID: "foo-uid"},
1920
}
2021

21-
Expect(SetControllerReference(dep, rs, scheme.Scheme)).NotTo(HaveOccurred())
22+
Expect(controllerutil.SetControllerReference(dep, rs, scheme.Scheme)).NotTo(HaveOccurred())
2223
t := true
2324
Expect(rs.OwnerReferences).To(ConsistOf(metav1.OwnerReference{
2425
Name: "foo",
@@ -35,12 +36,12 @@ var _ = Describe("Controllerutil", func() {
3536
dep := &extensionsv1beta1.Deployment{
3637
ObjectMeta: metav1.ObjectMeta{Name: "foo"},
3738
}
38-
Expect(SetControllerReference(dep, rs, runtime.NewScheme())).To(HaveOccurred())
39+
Expect(controllerutil.SetControllerReference(dep, rs, runtime.NewScheme())).To(HaveOccurred())
3940
})
4041

4142
It("should return an error if the owner isn't a runtime.Object", func() {
4243
rs := &appsv1.ReplicaSet{}
43-
Expect(SetControllerReference(&errMetaObj{}, rs, scheme.Scheme)).To(HaveOccurred())
44+
Expect(controllerutil.SetControllerReference(&errMetaObj{}, rs, scheme.Scheme)).To(HaveOccurred())
4445
})
4546
})
4647
})

pkg/source/internal/internal_suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package internal
17+
package internal_test
1818

1919
import (
2020
"testing"

0 commit comments

Comments
 (0)