Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@amuraru
amuraru committed Jul 12, 2021
1 parent bcbc2c4 commit 17024b2
Show file tree
Hide file tree
Showing 21 changed files with 597 additions and 326 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.13.8
- name: Set up Go 1.15
uses: actions/setup-go@v2
with:
go-version: 1.13.8
go-version: 1.15
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand All @@ -30,7 +30,7 @@ jobs:
uses: codecov/[email protected]
- name: Set env
run: |
echo "KUBERNETES_VERSION=v1.21.2" >> $GITHUB_ENV
echo "KUBERNETES_VERSION=v1.19.12" >> $GITHUB_ENV
echo "OPERATOR_SDK_VERSION=v0.19.4" >> $GITHUB_ENV
echo "MINIKUBE_VERSION=v1.22.0" >> $GITHUB_ENV
echo "KUBERNETES_CONFIG_FILE=$HOME/.kube/config" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SHELL=/bin/bash -o pipefail
PROJECT_NAME=zookeeper-operator
EXPORTER_NAME=zookeeper-exporter
APP_NAME=zookeeper
KUBE_VERSION=1.17.5
KUBE_VERSION=1.19.12
REPO=pravega/$(PROJECT_NAME)
TEST_REPO=testzkop/$(PROJECT_NAME)
APP_REPO=pravega/$(APP_NAME)
Expand Down Expand Up @@ -83,7 +83,7 @@ test-e2e-local:
operator-sdk test local ./test/e2e --operator-namespace default --up-local --go-test-flags "-v -timeout 0"

run-local:
operator-sdk up local
operator-sdk run local

login:
@docker login -u "$(DOCKER_USER)" -p "$(DOCKER_PASS)"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ The list of available commands are
### Build the operator image

Requirements:
- Go 1.13+
- Go 1.15+

Use the `make` command to build the Zookeeper operator image.

Expand Down
2 changes: 1 addition & 1 deletion cmd/exporter/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/pravega/zookeeper-operator/pkg/yamlexporter"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
logf "sigs.k8s.io/controller-runtime/pkg/log"
)

var (
Expand Down
13 changes: 3 additions & 10 deletions cmd/manager/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"fmt"
"os"
"runtime"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
"strings"

"github.com/operator-framework/operator-sdk/pkg/k8sutil"
Expand All @@ -28,9 +29,8 @@ import (
_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client/config"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
)

var (
Expand All @@ -52,13 +52,6 @@ func printVersion() {

func main() {
flag.Parse()

// The logger instantiated here can be changed to any logger
// implementing the logr.Logger interface. This logger will
// be propagated through the whole operator, generating
// uniform and structured logs.
logf.SetLogger(logf.ZapLogger(false))

printVersion()

if versionFlag {
Expand Down Expand Up @@ -92,7 +85,7 @@ func main() {
}

// Become the leader before proceeding
leader.Become(context.TODO(), "zookeeper-operator-lock")
leader.Become(context.Background(), "zookeeper-operator-lock")

// Create a new Cmd to provide shared dependencies and start components
mgr, err := manager.New(cfg, manager.Options{NewCache: managerWatchCache})
Expand Down
80 changes: 39 additions & 41 deletions deploy/crds/zookeeper.pravega.io_zookeeperclusters_crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,7 @@ spec:
description: Protocol for port. Must be UDP, TCP, or SCTP.
Defaults to "TCP".
type: string
default: TCP
required:
- containerPort
type: object
Expand Down Expand Up @@ -986,25 +987,19 @@ spec:
description: GMSACredentialSpec is where the GMSA admission
webhook (https://github.com/kubernetes-sigs/windows-gmsa)
inlines the contents of the GMSA credential spec named
by the GMSACredentialSpecName field. This field is
alpha-level and is only honored by servers that enable
the WindowsGMSA feature flag.
by the GMSACredentialSpecName field.
type: string
gmsaCredentialSpecName:
description: GMSACredentialSpecName is the name of the
GMSA credential spec to use. This field is alpha-level
and is only honored by servers that enable the WindowsGMSA
feature flag.
GMSA credential spec to use.
type: string
runAsUserName:
description: The UserName in Windows to run the entrypoint
of the container process. Defaults to the user specified
in image metadata if unspecified. May also be set
in PodSecurityContext. If set in both SecurityContext
and PodSecurityContext, the value specified in SecurityContext
takes precedence. This field is beta-level and may
be disabled with the WindowsRunAsUserName feature
flag.
takes precedence.
type: string
type: object
type: object
Expand All @@ -1016,7 +1011,7 @@ spec:
can be used to provide different probe parameters at the beginning
of a Pod''s lifecycle, when it might take a long time to load
data or warm a cache, than during steady-state operation.
This cannot be updated. This is an alpha feature enabled by
This cannot be updated. This is a beta feature enabled by
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
Expand Down Expand Up @@ -1174,7 +1169,7 @@ spec:
type: boolean
volumeDevices:
description: volumeDevices is the list of block devices to be
used by the container. This is a beta feature.
used by the container.
items:
description: volumeDevice describes a mapping of a raw block
device within a container.
Expand Down Expand Up @@ -1852,6 +1847,7 @@ spec:
description: Protocol for port. Must be UDP, TCP, or SCTP.
Defaults to "TCP".
type: string
default: TCP
required:
- containerPort
type: object
Expand Down Expand Up @@ -2115,25 +2111,19 @@ spec:
description: GMSACredentialSpec is where the GMSA admission
webhook (https://github.com/kubernetes-sigs/windows-gmsa)
inlines the contents of the GMSA credential spec named
by the GMSACredentialSpecName field. This field is
alpha-level and is only honored by servers that enable
the WindowsGMSA feature flag.
by the GMSACredentialSpecName field.
type: string
gmsaCredentialSpecName:
description: GMSACredentialSpecName is the name of the
GMSA credential spec to use. This field is alpha-level
and is only honored by servers that enable the WindowsGMSA
feature flag.
GMSA credential spec to use.
type: string
runAsUserName:
description: The UserName in Windows to run the entrypoint
of the container process. Defaults to the user specified
in image metadata if unspecified. May also be set
in PodSecurityContext. If set in both SecurityContext
and PodSecurityContext, the value specified in SecurityContext
takes precedence. This field is beta-level and may
be disabled with the WindowsRunAsUserName feature
flag.
takes precedence.
type: string
type: object
type: object
Expand All @@ -2145,7 +2135,7 @@ spec:
can be used to provide different probe parameters at the beginning
of a Pod''s lifecycle, when it might take a long time to load
data or warm a cache, than during steady-state operation.
This cannot be updated. This is an alpha feature enabled by
This cannot be updated. This is a beta feature enabled by
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
Expand Down Expand Up @@ -2303,7 +2293,7 @@ spec:
type: boolean
volumeDevices:
description: volumeDevices is the list of block devices to be
used by the container. This is a beta feature.
used by the container.
items:
description: volumeDevice describes a mapping of a raw block
device within a container.
Expand Down Expand Up @@ -2412,16 +2402,19 @@ spec:
type: string
type: array
dataSource:
description: This field requires the VolumeSnapshotDataSource
alpha feature gate to be enabled and currently VolumeSnapshot
is the only supported data source. If the provisioner can
support VolumeSnapshot data source, it will create a new
volume and data will be restored to the volume at the same
time. If the provisioner does not support VolumeSnapshot
data source, volume will not be created and the failure
will be reported as an event. In the future, we plan to
support more data source types and the behavior of the provisioner
may change.
description: 'This field can be used to specify either: *
An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot
- Beta) * An existing PVC (PersistentVolumeClaim) * An existing
custom resource/object that implements data population (Alpha)
In order to use VolumeSnapshot object types, the appropriate
feature gate must be enabled (VolumeSnapshotDataSource or
AnyVolumeDataSource) If the provisioner or an external controller
can support the specified data source, it will create a
new volume based on the contents of the specified data source.
If the specified data source is not supported, the volume
will not be created and the failure will be reported as
an event. In the future, we plan to support more data source
types and the behavior of the provisioner may change.'
properties:
apiGroup:
description: APIGroup is the group for the resource being
Expand Down Expand Up @@ -2519,7 +2512,7 @@ spec:
volumeMode:
description: volumeMode defines what type of volume is required
by the claim. Value of Filesystem is implied when not included
in claim spec. This is a beta feature.
in claim spec.
type: string
volumeName:
description: VolumeName is the binding reference to the PersistentVolume
Expand Down Expand Up @@ -3331,6 +3324,15 @@ spec:
permissions of any volume."
format: int64
type: integer
fsGroupChangePolicy:
description: 'fsGroupChangePolicy defines behavior of changing
ownership and permission of the volume before being exposed
inside Pod. This field will only apply to volume types which
support fsGroup based ownership(and permissions). It will
have no effect on ephemeral volume types such as: secret,
configmaps and emptydir. Valid values are "OnRootMismatch"
and "Always". If not specified defaults to "Always".'
type: string
runAsGroup:
description: The GID to run the entrypoint of the container
process. Uses runtime default if unset. May also be set
Expand Down Expand Up @@ -3418,24 +3420,19 @@ spec:
description: GMSACredentialSpec is where the GMSA admission
webhook (https://github.com/kubernetes-sigs/windows-gmsa)
inlines the contents of the GMSA credential spec named
by the GMSACredentialSpecName field. This field is alpha-level
and is only honored by servers that enable the WindowsGMSA
feature flag.
by the GMSACredentialSpecName field.
type: string
gmsaCredentialSpecName:
description: GMSACredentialSpecName is the name of the
GMSA credential spec to use. This field is alpha-level
and is only honored by servers that enable the WindowsGMSA
feature flag.
GMSA credential spec to use.
type: string
runAsUserName:
description: The UserName in Windows to run the entrypoint
of the container process. Defaults to the user specified
in image metadata if unspecified. May also be set in
PodSecurityContext. If set in both SecurityContext and
PodSecurityContext, the value specified in SecurityContext
takes precedence. This field is beta-level and may be
disabled with the WindowsRunAsUserName feature flag.
takes precedence.
type: string
type: object
type: object
Expand Down Expand Up @@ -3521,6 +3518,7 @@ spec:
description: Protocol for port. Must be UDP, TCP, or SCTP. Defaults
to "TCP".
type: string
default: TCP
required:
- containerPort
type: object
Expand Down
Loading

0 comments on commit 17024b2

Please sign in to comment.