Skip to content

update k8s dependencies to update protobuf version #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

update k8s dependencies to update protobuf version #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions integrity-shield-operator/config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,9 @@ rules:
- roles
verbs:
- '*'
- apiGroups:
- "coordination.k8s.io"
resources:
- leases
verbs:
- '*'
4 changes: 2 additions & 2 deletions integrity-shield-operator/controllers/integrityshield_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ type IntegrityShieldReconciler struct {
// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles;clusterrolebindings;roles;rolebindings,verbs=*
// +kubebuilder:rbac:groups=policy,resources=podsecuritypolicies,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=admissionregistration.k8s.io,resources=mutatingwebhookconfigurations,verbs=*
// +kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=*

func (r *IntegrityShieldReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
ctx := context.Background()
func (r *IntegrityShieldReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
reqLogger := r.Log.WithValues("Request.Namespace", req.Namespace, "Request.Name", req.Name)

// Fetch the IntegrityShield instance
Expand Down
4 changes: 2 additions & 2 deletions integrity-shield-operator/controllers/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func embedRSP(cr *apisv1alpha1.IntegrityShield) *apisv1alpha1.IntegrityShield {
}

var _ = BeforeSuite(func(done Done) {
logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
logf.SetLogger(zap.New())

By("bootstrapping test environment")
testEnv = &envtest.Environment{
Expand Down Expand Up @@ -240,7 +240,7 @@ var _ = Describe("Test integrity shield", func() {
maxReconcileTrial := 600
deployFound := &appsv1.Deployment{}
for {
_, recError := r.Reconcile(req)
_, recError := r.Reconcile(context.Background(), req)
i++

if i%10 == 0 {
Expand Down
41 changes: 17 additions & 24 deletions integrity-shield-operator/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,34 @@ require (
cloud.google.com/go v0.70.0 // indirect
github.com/IBM/integrity-enforcer/shield v0.0.0-20201001024601-320551d946dc
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-logr/logr v0.2.1
github.com/go-logr/zapr v0.2.0 // indirect
github.com/google/go-cmp v0.5.2
github.com/onsi/ginkgo v1.14.2
github.com/onsi/gomega v1.10.3
github.com/go-logr/logr v0.4.0
github.com/google/go-cmp v0.5.5
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/openshift/api v3.9.0+incompatible
github.com/prometheus/client_golang v1.8.0 // indirect
github.com/sirupsen/logrus v1.7.0 // indirect
go.uber.org/zap v1.16.0 // indirect
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
k8s.io/api v0.19.3
k8s.io/apiextensions-apiserver v0.19.3
k8s.io/apimachinery v0.19.3
k8s.io/client-go v12.0.0+incompatible
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
k8s.io/api v0.21.4
k8s.io/apiextensions-apiserver v0.21.4
k8s.io/apimachinery v0.21.4
k8s.io/client-go v0.21.4
k8s.io/klog v1.0.0
sigs.k8s.io/controller-runtime v0.6.3
sigs.k8s.io/controller-runtime v0.9.0
)

replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.4-0.20200207053602-7439e774c9e9+incompatible
github.com/IBM/integrity-enforcer/integrity-shield-operator => ./
github.com/IBM/integrity-enforcer/shield => ../shield
k8s.io/api => k8s.io/api v0.18.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.6
k8s.io/apimachinery => k8s.io/apimachinery v0.18.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.6
k8s.io/client-go => k8s.io/client-go v0.18.6
k8s.io/kubectl => k8s.io/kubectl v0.18.6
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.6.2
k8s.io/api => k8s.io/api v0.21.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.4
k8s.io/apimachinery => k8s.io/apimachinery v0.21.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.4
k8s.io/client-go => k8s.io/client-go v0.21.4
k8s.io/kubectl => k8s.io/kubectl v0.21.4
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.0
)

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

replace github.com/openshift/api => github.com/openshift/api v0.0.0-20190924102528-32369d4db2ad // Required until https://github.com/operator-framework/operator-lifecycle-manager/pull/1241 is resolved

replace golang.org/x/sys => golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6
576 changes: 228 additions & 348 deletions integrity-shield-operator/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 13 additions & 23 deletions observer/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,25 @@ go 1.15

require (
github.com/IBM/integrity-enforcer/shield v0.0.0-20201001024601-320551d946dc
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-logr/logr v0.2.1
github.com/google/go-cmp v0.5.2
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/hpcloud/tail v1.0.0
github.com/jasonlvhit/gocron v0.0.1 // indirect
github.com/onsi/ginkgo v1.14.2
github.com/onsi/gomega v1.10.3
github.com/openshift/api v3.9.0+incompatible
github.com/sirupsen/logrus v1.6.0
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
k8s.io/api v0.19.3
k8s.io/apiextensions-apiserver v0.19.3
k8s.io/apimachinery v0.19.3
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog v1.0.0
sigs.k8s.io/controller-runtime v0.6.3
github.com/jasonlvhit/gocron v0.0.1
github.com/sirupsen/logrus v1.7.0
k8s.io/api v0.21.4
k8s.io/apimachinery v0.21.4
k8s.io/client-go v0.21.4
)

replace (
github.com/IBM/integrity-enforcer/observer => ./
github.com/IBM/integrity-enforcer/shield => ../shield
k8s.io/api => k8s.io/api v0.18.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.6
k8s.io/apimachinery => k8s.io/apimachinery v0.18.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.6
k8s.io/client-go => k8s.io/client-go v0.18.6
k8s.io/kubectl => k8s.io/kubectl v0.18.6
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.6.2
k8s.io/api => k8s.io/api v0.21.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.4
k8s.io/apimachinery => k8s.io/apimachinery v0.21.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.4
k8s.io/client-go => k8s.io/client-go v0.21.4
k8s.io/kubectl => k8s.io/kubectl v0.21.4
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.0
)

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