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.

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

Upgrade to golang 1.17 and update dependencies #420

Merged
merged 2 commits into from
Dec 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.16
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.17
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand All @@ -33,9 +33,9 @@ jobs:
uses: codecov/[email protected]
- name: Set env
run: |
echo "KUBERNETES_VERSION=v1.19.13" >> $GITHUB_ENV
echo "KUBERNETES_VERSION=v1.20.13" >> $GITHUB_ENV
echo "OPERATOR_SDK_VERSION=v0.19.4" >> $GITHUB_ENV
echo "MINIKUBE_VERSION=v1.22.0" >> $GITHUB_ENV
echo "MINIKUBE_VERSION=v1.24.0" >> $GITHUB_ENV
echo "KUBERNETES_CONFIG_FILE=$HOME/.kube/config" >> $GITHUB_ENV
echo "CHANGE_MINIKUBE_NONE_USER=true" >> $GITHUB_ENV
- name: minikube setup
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG DOCKER_REGISTRY
ARG ALPINE_VERSION=3.14
FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}golang:1.16-alpine${ALPINE_VERSION} as go-builder
FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}golang:1.17-alpine${ALPINE_VERSION} as go-builder

ARG PROJECT_NAME=zookeeper-operator
ARG REPO_PATH=github.com/pravega/$PROJECT_NAME
Expand Down
2 changes: 1 addition & 1 deletion Makefile
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.19.13
KUBE_VERSION=1.20.13
REPO=pravega/$(PROJECT_NAME)
TEST_REPO=testzkop/$(PROJECT_NAME)
APP_REPO=pravega/$(APP_NAME)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ The list of available commands are
### Build the operator image

Requirements:
- Go 1.16+
- Go 1.17+

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

Expand Down
53 changes: 20 additions & 33 deletions charts/zookeeper-operator/templates/_crd_openapiv3schema.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -992,8 +992,7 @@ openAPIV3Schema:
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 a beta feature enabled by
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
description: One and only one of the following should be
Expand Down Expand Up @@ -2142,8 +2141,7 @@ openAPIV3Schema:
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 a beta feature enabled by
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
description: One and only one of the following should be
Expand Down Expand Up @@ -2410,18 +2408,14 @@ openAPIV3Schema:
type: array
dataSource:
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.'
An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
* An existing PVC (PersistentVolumeClaim) * An existing
custom resource that implements data population (Alpha)
In order to use custom resource types that implement data
population, the AnyVolumeDataSource feature gate must be
enabled. 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.'
properties:
apiGroup:
description: APIGroup is the group for the resource being
Expand Down Expand Up @@ -3339,7 +3333,7 @@ openAPIV3Schema:
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".'
and "Always". If not specified, "Always" is used.'
type: string
runAsGroup:
description: The GID to run the entrypoint of the container
Expand Down Expand Up @@ -4104,20 +4098,15 @@ openAPIV3Schema:
type: array
dataSource:
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.'
either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
* An existing PVC (PersistentVolumeClaim) * An
existing custom resource that implements data
population (Alpha) In order to use custom resource
types that implement data population, the AnyVolumeDataSource
feature gate must be enabled. 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.'
properties:
apiGroup:
description: APIGroup is the group for the resource
Expand Down Expand Up @@ -4820,8 +4809,6 @@ openAPIV3Schema:
type: object
type: object
type: array
required:
- sources
type: object
quobyte:
description: Quobyte represents a Quobyte mount on the host
Expand Down
53 changes: 20 additions & 33 deletions deploy/crds/zookeeper.pravega.io_zookeeperclusters_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1036,8 +1036,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 a beta feature enabled by
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
description: One and only one of the following should be
Expand Down Expand Up @@ -2185,8 +2184,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 a beta feature enabled by
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
description: One and only one of the following should be
Expand Down Expand Up @@ -2453,18 +2451,14 @@ spec:
type: array
dataSource:
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.'
An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
* An existing PVC (PersistentVolumeClaim) * An existing
custom resource that implements data population (Alpha)
In order to use custom resource types that implement data
population, the AnyVolumeDataSource feature gate must be
enabled. 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.'
properties:
apiGroup:
description: APIGroup is the group for the resource being
Expand Down Expand Up @@ -3382,7 +3376,7 @@ spec:
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".'
and "Always". If not specified, "Always" is used.'
type: string
runAsGroup:
description: The GID to run the entrypoint of the container
Expand Down Expand Up @@ -4148,20 +4142,15 @@ spec:
type: array
dataSource:
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.'
either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
* An existing PVC (PersistentVolumeClaim) * An
existing custom resource that implements data
population (Alpha) In order to use custom resource
types that implement data population, the AnyVolumeDataSource
feature gate must be enabled. 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.'
properties:
apiGroup:
description: APIGroup is the group for the resource
Expand Down Expand Up @@ -4864,8 +4853,6 @@ spec:
type: object
type: object
type: array
required:
- sources
type: object
quobyte:
description: Quobyte represents a Quobyte mount on the host
Expand Down
Loading