feat: resolve conflicts

buttahtoast · Jun 20, 2024 · 1d42552 · 1d42552
1 parent a670ae5
commit 1d42552
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/s3-mirror/README.md b/s3-mirror/README.md
@@ -103,9 +103,9 @@ bins:
 | ------------------------ | ------- |
 | `s3_bucket`           | `S3_BUCKET` |
 | `config`               | `CONFIG_FILE` |
-| `s3_region`             | `AWS_REGION` |
-| `s3_access_key`           | `AWS_ACCESS_KEY_ID` |
-| `s3_secret_key`              | `AWS_SECRET_ACCESS_KEY` |
+| `s3_region`             | `S3_REGION` |
+| `s3_access_key`           | `S3_ACCESS_KEY_ID` |
+| `s3_secret_key`              | `S3_SECRET_ACCESS_KEY` |
 | `s3_endpoint`          | `S3_ENDPOINT` |
 | `s3_tlssecure`          | `S3_TLSSECURE` |
 | `log_level`   | `LOG_LEVEL` |
diff --git a/s3-mirror/k8s-binary-downloader b/s3-mirror/k8s-binary-downloader
diff --git a/s3-mirror/main.go b/s3-mirror/main.go
@@ -215,19 +215,19 @@ func main() {
 				Usage:    "Bucket region",
 				Value:    "us-east-1",
 				Required: false,
-				EnvVars:  []string{"AWS_REGION"},
+				EnvVars:  []string{"S3_REGION"},
 			},
 			&cli.StringFlag{
 				Name:     "access-key",
-				Usage:    "AWS access key ID",
+				Usage:    "S3 access key ID",
 				Required: true,
-				EnvVars:  []string{"AWS_ACCESS_KEY_ID"},
+				EnvVars:  []string{"S3_ACCESS_KEY_ID"},
 			},
 			&cli.StringFlag{
 				Name:     "secret-key",
-				Usage:    "AWS secret access key",
+				Usage:    "S3 secret access key",
 				Required: true,
-				EnvVars:  []string{"AWS_SECRET_ACCESS_KEY"},
+				EnvVars:  []string{"S3_SECRET_ACCESS_KEY"},
 			},
 			&cli.StringFlag{
 				Name:     "endpoint",

diff --git a/talos-mirror/talos.yaml b/talos-mirror/talos.yaml
@@ -0,0 +1,12 @@
+talos:
+  items:
+    - factory:
+       customization:
+         systemExtensions:
+           officialExtensions:
+             - siderolabs/bnx2-bnx2x
+             - siderolabs/i915-ucode
+             - siderolabs/iscsi-tools
+      versions:
+        github: "https://github.com/siderolabs/talos"
+        semver: ">=1.7.0"