Skip to content

Commit 98d998c

Browse files
authored
Changes for the operator v2 release (FoundationDB#2212)
* Changes for the operator v2 release * Fix the build and test setup * Remove old CRD * Add changes for review and remove some old code * Correct configuration normalize method
1 parent c20f10b commit 98d998c

File tree

72 files changed

+951
-27555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+951
-27555
lines changed

.github/workflows/pull_request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77

88
env:
9-
FDB_VER: "6.2.29"
9+
FDB_VER: "7.1.67"
1010

1111
jobs:
1212
lint-go:

Dockerfile

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG FDB_VERSION=6.2.29
1+
ARG FDB_VERSION=7.1.67
22
ARG FDB_WEBSITE=https://github.com/apple/foundationdb/releases/download
33

44
# Build the manager binary
@@ -10,10 +10,9 @@ ARG TAG="latest"
1010

1111
RUN set -eux && \
1212
curl --fail -L "${FDB_WEBSITE}/${FDB_VERSION}/foundationdb-clients_${FDB_VERSION}-1_amd64.deb" -o foundationdb-clients_${FDB_VERSION}-1_amd64.deb && \
13-
curl --fail -L "${FDB_WEBSITE}/${FDB_VERSION}/foundationdb-clients_${FDB_VERSION}-1_amd64.deb" -o foundationdb-clients_${FDB_VERSION}-1_amd64.deb.sha256 && \
14-
# TODO(johscheuer): The 6.2.29 sha256 file is not well formatted, enable this check again once 7.1 is used as base. \
15-
# sha256sum -c foundationdb-clients_${FDB_VERSION}-1_amd64.deb.sha256 && \
16-
dpkg -i foundationdb-clients_${FDB_VERSION}-1_amd64.deb && \
13+
curl --fail -L "${FDB_WEBSITE}/${FDB_VERSION}/foundationdb-clients_${FDB_VERSION}-1_amd64.deb.sha256" -o foundationdb-clients_${FDB_VERSION}-1_amd64.deb.sha256 && \
14+
sha256sum -c foundationdb-clients_${FDB_VERSION}-1_amd64.deb.sha256 && \
15+
dpkg -i foundationdb-clients_${FDB_VERSION}-1_amd64.deb && \
1716
rm foundationdb-clients_${FDB_VERSION}-1_amd64.deb foundationdb-clients_${FDB_VERSION}-1_amd64.deb.sha256
1817

1918
WORKDIR /workspace
@@ -60,9 +59,8 @@ RUN set -eux && \
6059
curl --fail -L "${FDB_WEBSITE}/${FDB_VERSION}/foundationdb-clients-${FDB_VERSION}-1.el7.x86_64.rpm.sha256" -o foundationdb-clients-${FDB_VERSION}-1.el7.x86_64.rpm.sha256 && \
6160
microdnf install -y glibc pkg-config && \
6261
microdnf clean all && \
63-
# TODO(johscheuer): The 6.2.29 sha256 file is not well formatted, enable this check again once 7.1 is used as base. \
64-
# sha256sum -c foundationdb-clients-${FDB_VERSION}-1.el7.x86_64.rpm.sha256 && \
65-
rpm -i foundationdb-clients-${FDB_VERSION}-1.el7.x86_64.rpm --excludepath=/usr/bin --excludepath=/usr/lib/foundationdb/backup_agent && \
62+
sha256sum -c foundationdb-clients-${FDB_VERSION}-1.el7.x86_64.rpm.sha256 && \
63+
rpm -i foundationdb-clients-${FDB_VERSION}-1.el7.x86_64.rpm --excludepath=/usr/bin --excludepath=/usr/lib/foundationdb/backup_agent && \
6664
rm foundationdb-clients-${FDB_VERSION}-1.el7.x86_64.rpm foundationdb-clients-${FDB_VERSION}-1.el7.x86_64.rpm.sha256
6765

6866
COPY --from=builder /etc/passwd /etc/passwd

api/v1beta1/foundationdb_custom_parameter.go

-76
This file was deleted.

api/v1beta1/foundationdb_custom_parameter_test.go

-90
This file was deleted.

0 commit comments

Comments
 (0)