Skip to content
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

Jump to bottom

Update golang to 1.20.5 #319

Closed
wants to merge 2 commits into from
Closed

Update golang to 1.20.5 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e62674d
Updated golang to 1.20.5
awels Jun 15, 2023
8c12f2f
Use status().update instead of deleting and creating objects
awels Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 6 additions & 7 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,15 @@ import (
ocpconfigv1 "github.com/openshift/api/config/v1"
secv1 "github.com/openshift/api/security/v1"

"kubevirt.io/hostpath-provisioner-operator/pkg/apis"
hppv1 "kubevirt.io/hostpath-provisioner-operator/pkg/apis/hostpathprovisioner/v1beta1"
"kubevirt.io/hostpath-provisioner-operator/pkg/controller"
"kubevirt.io/hostpath-provisioner-operator/pkg/util/cryptopolicy"

"github.com/operator-framework/operator-sdk/pkg/k8sutil"
"github.com/operator-framework/operator-sdk/pkg/log/zap"
"github.com/operator-framework/operator-sdk/pkg/restmapper"
sdkVersion "github.com/operator-framework/operator-sdk/version"
"github.com/spf13/pflag"
"kubevirt.io/hostpath-provisioner-operator/pkg/apis"
hppv1 "kubevirt.io/hostpath-provisioner-operator/pkg/apis/hostpathprovisioner/v1beta1"
"kubevirt.io/hostpath-provisioner-operator/pkg/controller"
"kubevirt.io/hostpath-provisioner-operator/pkg/util/cryptopolicy"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
Expand Down Expand Up @@ -90,7 +89,7 @@ func main() {
// Create a new Cmd to provide shared dependencies and start components
mgr, err := manager.New(cfg, manager.Options{
Namespace: namespace,
MapperProvider: restmapper.NewDynamicRESTMapper,
MapperProvider: apiutil.NewDynamicRESTMapper,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

People are working around issues by using this mapperprovider:
https://github.com/statnett/image-scanner-operator/pull/394/files#diff-4ddb9905d3f2a223cd9c0ccbe71976ff5ab27898b7464052462724c0c0634b2bR120
Which I think is worse than what we had before, just something to consider

HealthProbeBindAddress: "0.0.0.0:6060",
ReadinessEndpointName: "/readyz",
LivenessEndpointName: "/livez",
Expand Down
6 changes: 3 additions & 3 deletions deploy/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ spec:
in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field
is immutable."
is immutable. It can only be set for containers."
items:
description: ResourceClaim references one entry in
PodSpec.ResourceClaims.
Expand Down Expand Up @@ -634,7 +634,7 @@ spec:
of compute resources required. If Requests is omitted
for a container, it defaults to Limits if that is
explicitly specified, otherwise to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
selector:
Expand Down Expand Up @@ -1735,7 +1735,7 @@ spec:
volume is being resized then the Condition will
be set to 'ResizeStarted'.
items:
description: PersistentVolumeClaimCondition contails
description: PersistentVolumeClaimCondition contains
details about state of pvc
properties:
lastProbeTime:
Expand Down
54 changes: 27 additions & 27 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ require (
github.com/prometheus/client_golang v1.15.1
github.com/spf13/pflag v1.0.5
go.uber.org/zap v1.24.0
k8s.io/api v0.27.2
k8s.io/api v0.27.3
k8s.io/apiextensions-apiserver v0.27.2
k8s.io/apimachinery v0.27.2
k8s.io/apimachinery v0.27.3
k8s.io/client-go v12.0.0+incompatible
k8s.io/code-generator v0.26.1
k8s.io/code-generator v0.27.3
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/controller-runtime v0.15.0
Expand Down Expand Up @@ -58,7 +58,7 @@ require (
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/mod v0.10.0 // indirect
Expand All @@ -76,7 +76,7 @@ require (
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.27.2 // indirect
k8s.io/component-base v0.27.3 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
Expand All @@ -86,27 +86,27 @@ require (
)

replace (
k8s.io/api => k8s.io/api v0.26.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.1
k8s.io/apimachinery => k8s.io/apimachinery v0.26.1
k8s.io/apiserver => k8s.io/apiserver v0.26.1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.1
k8s.io/client-go => k8s.io/client-go v0.26.1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.1
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.1
k8s.io/code-generator => k8s.io/code-generator v0.26.1
k8s.io/component-base => k8s.io/component-base v0.26.1
k8s.io/cri-api => k8s.io/cri-api v0.26.1
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.1
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.1
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.1
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.1
k8s.io/kubectl => k8s.io/kubectl v0.26.1
k8s.io/kubelet => k8s.io/kubelet v0.26.1
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.1
k8s.io/metrics => k8s.io/metrics v0.26.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.1
k8s.io/api => k8s.io/api v0.27.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.3
k8s.io/apimachinery => k8s.io/apimachinery v0.27.3
k8s.io/apiserver => k8s.io/apiserver v0.27.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.3
k8s.io/client-go => k8s.io/client-go v0.27.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.3
k8s.io/code-generator => k8s.io/code-generator v0.27.3
k8s.io/component-base => k8s.io/component-base v0.27.3
k8s.io/cri-api => k8s.io/cri-api v0.27.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.3
k8s.io/kubectl => k8s.io/kubectl v0.27.3
k8s.io/kubelet => k8s.io/kubelet v0.27.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.3
k8s.io/metrics => k8s.io/metrics v0.27.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.3
)

replace (
Expand All @@ -116,4 +116,4 @@ replace (
github.com/spf13/pflag => github.com/spf13/pflag v1.0.5
)

go 1.19
go 1.20