Merge pull request #107 from appuio/update-deps

Update Go dependencies

config/crd/bases/managedupgrade.appuio.io_clusterversions.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: clusterversions.managedupgrade.appuio.io
 spec:
   group: managedupgrade.appuio.io
@@ -124,7 +124,6 @@ spec:
                                 to fail. You may specify the version field without setting image if
                                 an update exists with that version in the availableUpdates or history.
 
-
                                 If an upgrade fails the operator will halt and report status
                                 about the failing component. Setting the desired update value back to
                                 the previous version will cause a rollback to be attempted. Not all
@@ -271,7 +270,6 @@ spec:
                           to fail. You may specify the version field without setting image if
                           an update exists with that version in the availableUpdates or history.
 
-
                           If an upgrade fails the operator will halt and report status
                           about the failing component. Setting the desired update value back to
                           the previous version will cause a rollback to be attempted. Not all
@@ -415,7 +413,6 @@ spec:
                       to fail. You may specify the version field without setting image if
                       an update exists with that version in the availableUpdates or history.
 
-
                       If an upgrade fails the operator will halt and report status
                       about the failing component. Setting the desired update value back to
                       the previous version will cause a rollback to be attempted. Not all
@@ -575,7 +572,6 @@ spec:
                                 to fail. You may specify the version field without setting image if
                                 an update exists with that version in the availableUpdates or history.
 
-
                                 If an upgrade fails the operator will halt and report status
                                 about the failing component. Setting the desired update value back to
                                 the previous version will cause a rollback to be attempted. Not all

config/crd/bases/managedupgrade.appuio.io_upgradeconfigs.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: upgradeconfigs.managedupgrade.appuio.io
 spec:
   group: managedupgrade.appuio.io

config/crd/bases/managedupgrade.appuio.io_upgradejobs.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: upgradejobs.managedupgrade.appuio.io
 spec:
   group: managedupgrade.appuio.io
@@ -213,16 +213,8 @@ spec:
               conditions:
                 description: Conditions is a list of conditions for the UpgradeJob
                 items:
-                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.\n---\nThis struct is intended for
-                    direct use as an array at the field path .status.conditions.  For
-                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
-                    observations of a foo's current state.\n\t    // Known .status.conditions.type
-                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
-                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
-                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
-                    \   // other fields\n\t}"
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
                       description: |-
@@ -263,12 +255,7 @@ spec:
                       - Unknown
                       type: string
                     type:
-                      description: |-
-                        type of condition in CamelCase or in foo.example.com/CamelCase.
-                        ---
-                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
-                        useful (see .node.status.conditions), the ability to deconflict is important.
-                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string

config/crd/bases/managedupgrade.appuio.io_upgradesuspensionwindows.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: upgradesuspensionwindows.managedupgrade.appuio.io
 spec:
   group: managedupgrade.appuio.io

config/rbac/role.yaml

@@ -32,6 +32,7 @@ rules:
   - update
 - apiGroups:
   - config.openshift.io
+  - managedupgrade.appuio.io
   resources:
   - clusterversions
   verbs:
@@ -50,75 +51,30 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - managedupgrade.appuio.io
-  resources:
-  - clusterversions
-  verbs:
-  - get
-  - list
-  - patch
-  - update
-  - watch
 - apiGroups:
   - managedupgrade.appuio.io
   resources:
   - clusterversions/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - managedupgrade.appuio.io
-  resources:
-  - clusterversions/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - managedupgrade.appuio.io
-  resources:
-  - upgradeconfigs
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - managedupgrade.appuio.io
-  resources:
   - upgradeconfigs/finalizers
+  - upgradejobs/finalizers
   verbs:
   - update
 - apiGroups:
   - managedupgrade.appuio.io
   resources:
+  - clusterversions/status
   - upgradeconfigs/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - managedupgrade.appuio.io
-  resources:
-  - upgradejobhooks
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - managedupgrade.appuio.io
-  resources:
   - upgradejobhooks/status
+  - upgradejobs/status
+  - upgradesuspensionwindows/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
   - managedupgrade.appuio.io
   resources:
+  - upgradeconfigs
   - upgradejobs
   verbs:
   - create
@@ -131,30 +87,9 @@ rules:
 - apiGroups:
   - managedupgrade.appuio.io
   resources:
-  - upgradejobs/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - managedupgrade.appuio.io
-  resources:
-  - upgradejobs/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - managedupgrade.appuio.io
-  resources:
+  - upgradejobhooks
   - upgradesuspensionwindows
   verbs:
   - get
   - list
   - watch
-- apiGroups:
-  - managedupgrade.appuio.io
-  resources:
-  - upgradesuspensionwindows/status
-  verbs:
-  - get
-  - patch
-  - update

go.mod

@@ -1,48 +1,49 @@
 module github.com/appuio/openshift-upgrade-controller
 
-go 1.22.0
+go 1.23
 
-toolchain go1.22.5
+toolchain go1.23.2
 
 require (
 	github.com/openshift/api v0.0.0-20230213134911-7ba313770556 // release-4.11
 	github.com/openshift/machine-config-operator v0.0.1-0.20230508173032-8f952d7fd139 // release-4.11
-	github.com/prometheus/client_golang v1.19.1
-	github.com/robfig/cron/v3 v3.0.1
-	github.com/stretchr/testify v1.9.0
-	golang.org/x/mod v0.18.0
-	k8s.io/api v0.30.2
-	k8s.io/apimachinery v0.30.2
-	k8s.io/client-go v0.30.2
-	sigs.k8s.io/controller-runtime v0.18.4
-	sigs.k8s.io/controller-tools v0.15.0
-	sigs.k8s.io/kustomize/kustomize/v5 v5.4.2
 )
 
 require (
-	dario.cat/mergo v1.0.0
-	github.com/Masterminds/semver/v3 v3.2.1
+	dario.cat/mergo v1.0.1
+	github.com/Masterminds/semver/v3 v3.3.0
+	github.com/prometheus/client_golang v1.20.4
+	github.com/robfig/cron/v3 v3.0.1
+	github.com/stretchr/testify v1.9.0
 	go.uber.org/multierr v1.11.0
-	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
+	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
+	golang.org/x/mod v0.21.0
+	k8s.io/api v0.31.1
+	k8s.io/apimachinery v0.31.1
+	k8s.io/client-go v0.31.1
+	sigs.k8s.io/controller-runtime v0.19.0
+	sigs.k8s.io/controller-tools v0.16.3
+	sigs.k8s.io/kustomize/kustomize/v5 v5.4.3
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/emicklei/go-restful/v3 v3.11.3 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
-	github.com/fatih/color v1.16.0 // indirect
+	github.com/fatih/color v1.17.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-errors/errors v1.5.1 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-errors/errors v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
-	github.com/go-openapi/jsonpointer v0.20.3 // indirect
-	github.com/go-openapi/jsonreference v0.20.5 // indirect
-	github.com/go-openapi/swag v0.22.10 // indirect
-	github.com/gobuffalo/flect v1.0.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/gobuffalo/flect v1.0.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -55,6 +56,8 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.17.10 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -64,37 +67,38 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_model v0.6.0 // indirect
-	github.com/prometheus/common v0.49.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/spf13/cobra v1.8.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.60.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/sergi/go-diff v1.2.0 // indirect
+	github.com/spf13/cobra v1.8.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
-	go.starlark.net v0.0.0-20240123142251-f86470692795 // indirect
+	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/net v0.26.0 // indirect
-	golang.org/x/oauth2 v0.17.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/term v0.21.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.22.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/term v0.24.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/time v0.6.0 // indirect
+	golang.org/x/tools v0.25.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.30.1 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
+	k8s.io/apiextensions-apiserver v0.31.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
+	k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kustomize/api v0.17.2 // indirect
-	sigs.k8s.io/kustomize/cmd/config v0.14.1 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
+	sigs.k8s.io/kustomize/api v0.17.3 // indirect
+	sigs.k8s.io/kustomize/cmd/config v0.14.2 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )