diff --git a/Dockerfile b/Dockerfile index d20526ece..55f06b40d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,8 +45,7 @@ RUN mkdir -p /tmp/rpms && \ rustup default stable && \ git clone https://github.com/aws/efs-utils && \ cd efs-utils && \ - git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) && \ - make rpm && mv build/amazon-efs-utils*rpm /tmp/rpms && \ + make rpm-without-system-rust && mv build/amazon-efs-utils*rpm /tmp/rpms && \ # clean up efs-utils folder after install cd .. && rm -rf efs-utils && \ yum clean all; \ diff --git a/pkg/driver/efs_watch_dog.go b/pkg/driver/efs_watch_dog.go index e4083c8d6..2b4471aac 100644 --- a/pkg/driver/efs_watch_dog.go +++ b/pkg/driver/efs_watch_dog.go @@ -88,7 +88,6 @@ disable_fetch_ec2_metadata_token = false [mount.cn-north-1] dns_name_suffix = amazonaws.com.cn - [mount.cn-northwest-1] dns_name_suffix = amazonaws.com.cn @@ -108,6 +107,18 @@ stunnel_cafile = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem dns_name_suffix = sc2s.sgov.gov stunnel_cafile = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem +[mount.us-isof-east-1] +dns_name_suffix = csp.hci.ic.gov +stunnel_cafile = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem + +[mount.us-isof-south-1] +dns_name_suffix = csp.hci.ic.gov +stunnel_cafile = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem + +[mount.eu-isoe-west-1] +dns_name_suffix = cloud.adc-e.uk +stunnel_cafile = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem + [mount-watchdog] enabled = true poll_interval_sec = 1 diff --git a/pkg/driver/efs_watch_dog_test.go b/pkg/driver/efs_watch_dog_test.go index 38525d7be..ef81830bb 100644 --- a/pkg/driver/efs_watch_dog_test.go +++ b/pkg/driver/efs_watch_dog_test.go @@ -74,7 +74,6 @@ disable_fetch_ec2_metadata_token = false [mount.cn-north-1] dns_name_suffix = amazonaws.com.cn - [mount.cn-northwest-1] dns_name_suffix = amazonaws.com.cn @@ -94,6 +93,18 @@ stunnel_cafile = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem dns_name_suffix = sc2s.sgov.gov stunnel_cafile = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem +[mount.us-isof-east-1] +dns_name_suffix = csp.hci.ic.gov +stunnel_cafile = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem + +[mount.us-isof-south-1] +dns_name_suffix = csp.hci.ic.gov +stunnel_cafile = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem + +[mount.eu-isoe-west-1] +dns_name_suffix = cloud.adc-e.uk +stunnel_cafile = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem + [mount-watchdog] enabled = true poll_interval_sec = 1