Skip to content

Commit

Permalink
fix backwards-incompatible change on gcsfuse (#328)
Browse files Browse the repository at this point in the history
* fix backwards-incompatible change on gcsfuse

* Automated commit: update images.

* Update Dockerfile

allow caching the type (dir vs file) so that things are a bit faster. this creates weird race conditions (file vs. dir) but that should be fine (tm)

* dummy commit

* Automated commit: update images.
  • Loading branch information
sirdarckcat authored Jul 9, 2021
1 parent 71aa83a commit f4093ac
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dist/resources/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
serviceAccountName: kctf-operator
containers:
- name: kctf-operator
image: gcr.io/kctf-docker/kctf-operator@sha256:a42991dd7d2d4267815572912ce0410094d8a83af50df1f12b86616de890c9ac
image: gcr.io/kctf-docker/kctf-operator@sha256:72e587201d532cc77de7b791d51ea35917b5808e0335807ab93481997067e874
command:
- kctf-operator
imagePullPolicy: Always
Expand Down
2 changes: 1 addition & 1 deletion docker-images/gcsfuse/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ RUN wget -q https://github.com/GoogleCloudPlatform/gcsfuse/releases/download/v0.
RUN mkdir -p /mnt/disks/gcs

CMD test -f /config/gcs_bucket &&\
gcsfuse --foreground --debug_fuse --debug_gcs --stat-cache-ttl 0 -type-cache-ttl 0 -o allow_other -o nonempty --file-mode 0777 --dir-mode 0777 --uid 1000 --gid 1000 "$(cat /config/gcs_bucket)" /mnt/disks/gcs
gcsfuse --foreground --debug_fuse --debug_gcs --stat-cache-ttl 0 -o allow_other --file-mode 0777 --dir-mode 0777 --uid 1000 --gid 1000 "$(cat /config/gcs_bucket)" /mnt/disks/gcs
6 changes: 3 additions & 3 deletions kctf-operator/pkg/resources/constants.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package resources

// <AUTOMATICALLY GENERATED>
// <AUTOMATICALLY GENERATED>
// =======================================
// == || These are set by automation || ==
// .. vv ........................... vv ..

const DOCKER_CERTBOT_IMAGE = "gcr.io/kctf-docker/certbot@sha256:82be4c84fad2a11a6b92aa472cab2dd7018178ab89f27d4d77f46997ff539229"
const DOCKER_GCSFUSE_IMAGE = "gcr.io/kctf-docker/gcsfuse@sha256:560897fba48dffba06e3a03c0b959bebc5e8bcb01d51e71bce75e05d0ad71119"
const DOCKER_GCSFUSE_IMAGE = "gcr.io/kctf-docker/gcsfuse@sha256:b3e780cd860d3566bd91e6cc5a39e55377a33c22ff521b393f14947852967831"

// .. ^^ ........................... ^^ ..
// == || These are set by automation || ==
// =======================================
// </AUTOMATICALLY GENERATED>
// </AUTOMATICALLY GENERATED>

0 comments on commit f4093ac

Please sign in to comment.