Skip to content

Commit 154b454

Browse files
xnotoclaude
andauthored
chore: deprecate openshift (#8)
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 5caf7ec commit 154b454

4 files changed

Lines changed: 12 additions & 27 deletions

File tree

gh-protections.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ resource "github_branch_protection" "protections" {
1919
contexts = []
2020
}
2121
required_pull_request_reviews {
22-
dismissal_restrictions = ["/${github_team.admins.slug}"]
22+
dismissal_restrictions = ["${var.github_owner}/${github_team.admins.slug}"]
2323
dismiss_stale_reviews = true
24-
pull_request_bypassers = ["/${github_team.admins.slug}"]
24+
pull_request_bypassers = ["${var.github_owner}/${github_team.admins.slug}"]
2525
require_code_owner_reviews = true
2626
required_approving_review_count = 0
2727
require_last_push_approval = true
2828
restrict_dismissals = true
2929
}
3030
restrict_pushes {
3131
push_allowances = [
32-
"/${github_team.admins.slug}"
32+
"${var.github_owner}/${github_team.admins.slug}"
3333
]
3434
}
3535
depends_on = [github_repository.repositories, github_team.admins]

main.tf

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,25 +93,6 @@ locals {
9393
"tfroot-github"
9494
]
9595
}
96-
"openshift_server_url" = {
97-
name = "OPENSHIFT_SERVER_URL"
98-
value = data.sops_file.secret_vars.data["openshift_server_url"]
99-
repositories = [
100-
"images",
101-
"kustomize-cluster"
102-
]
103-
}
104-
"openshift_username" = {
105-
name = "OPENSHIFT_USERNAME"
106-
value = data.sops_file.secret_vars.data["openshift_username"]
107-
repositories = [
108-
"images",
109-
"kustomize-cluster"
110-
]
111-
}
112-
# NOTE: OPENSHIFT_TOKEN is managed by ArgoCD PostSync job (ci-token-sync)
113-
# in kustomize-cluster, not Terraform. This allows automatic token refresh
114-
# when the cluster is recreated.
11596
"sops_age_key" = {
11697
name = "SOPS_AGE_KEY"
11798
value = data.sops_file.secret_vars.data["sops_age_key"]

provider.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ terraform {
33
# stating a required minimum version should be sufficient for most use cases.
44
required_version = "> 1.3"
55

6-
backend "s3" {}
6+
# Dummy values are present only so `terraform validate` can validate the
7+
# backend schema. These values are overridden by the Makefile during init.
8+
backend "s3" {
9+
bucket = "validation-only"
10+
key = "validation-only.tfstate"
11+
region = "us-east-1"
12+
}
713

814
# please don't pin provider versions unless there is a known bug being worked around.
915
# please add comment-doc when pinning to reference upstream bugs/docs that show the reason for the pin.

secrets/secrets.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ onion_aws_region: ENC[AES256_GCM,data:kP66iQ2k6vXO,iv:5f+KdsYfkv+SPW0ra9w270TlSk
1313
onion_s3_bucket: ENC[AES256_GCM,data:KmfWCcoufDnZiv/KpRMeYyg1HLqbFA==,iv:5bIEcMZHl2ijTsOnd/CNk8Sqh9jrvA7ZGL4Ugx2psqs=,tag:uSXOUfk9FgIgOvB+CuT+Ug==,type:str]
1414
onion_aws_access_key_id: ENC[AES256_GCM,data:aP4lIpJvjUUn4tDabVG/XN5MCCw=,iv:Qt56iiwYHWSt7LmJhBGk1s8SZyeBchnUswOPkIgnMcE=,tag:+WKU5gy6xiBGebFL4qcQ8A==,type:str]
1515
onion_aws_secret_access_key: ENC[AES256_GCM,data:VyTmQP0ePPwub0ii3jhpeBlXCw9jJcO1n1UWElzIoQ/hKzRxYB6fuA==,iv:aVtTdR6xVgHw9GNiidvVpENgVEex/NVAauCBr5Di+c8=,tag:XyjxwZhNnTBdq1wiVlNXEA==,type:str]
16-
openshift_server_url: ENC[AES256_GCM,data:OK0m0QURVnKDJQUDE5UrNbsCAf6u30olJQ==,iv:Ovu064CCaiEni2xvlJd2uU6bqhg0irzpEl12lGj4biw=,tag:zwAuOwr2TR+zQVeoSxQ1ow==,type:str]
17-
openshift_username: ENC[AES256_GCM,data:/Vz+CqCBvCVoW116ItaYTUUjrPRsKz2r10kypoqesd2BqX7EK2CQ0WyOvlP80qpbEZA=,iv:I9fViz9ZWrJRvGzTlYr0I8wy88GgiDNP0C+/Vu8Vd6I=,tag:Z32PzBTX4Vj3KX4IGPVb6A==,type:str]
1816
sops_age_key: ENC[AES256_GCM,data:kK8zWix/ixpRHbkIO+7H9njNjNvyywJf47qzyUnZ1gGIDrXvsbucfsVkXQ8KCJNFaMFtV2Q8za74zHoDvaIHGMIrqO/lZEU3Mkk=,iv:ZrS0+rzlhF7c3yTP6p95cvGgiCcIKCFmR3ciNZF08a8=,tag:R7mToFSZynMeDppDrHoCcg==,type:str]
1917
www_aws_region: ENC[AES256_GCM,data:zNlYVEdfWSt7,iv:1EuJEcGCehdNXefjdxbsf+EIQAAriahlsLvSFX1juuQ=,tag:rKXSez3x63hQOW5dxfuORQ==,type:str]
2018
www_s3_bucket: ENC[AES256_GCM,data:IAv46XzbFFYnQnwvwxR6CA==,iv:1VrY1BHtSH0h1GZ33A0dB86yEuWBa7iYyYBoMPfSBEU=,tag:FASm43yXO3G0ZPG4q2TeWg==,type:str]
@@ -33,7 +31,7 @@ sops:
3331
YlFmOUhWbWlsd2ttYWRaYTk4T3dCbFUKzXuqXD6QH9orC7kCcSKNQhIyUNBtlITv
3432
FIk3D7Niz2eNMyom5OobkRKVg33NpYdOusvchxqpJc0i4ydqyGkMzw==
3533
-----END AGE ENCRYPTED FILE-----
36-
lastmodified: "2026-04-30T04:41:14Z"
37-
mac: ENC[AES256_GCM,data:GOJ8/uoO0nWVrpEDLAF2BF+WqjoxNxg/x5nJievPPKzewyhCwDsuMkDFNCq/QWXpt9OUpxoyDSXMhEbT7igJ7aqcwlkdqvGWvDBGFBjR/uKKL0BLCH8DqD58h20baJX5h71/35jl/8AabBTR2akkE1a+lUJE/6KL/kTmPN29rc0=,iv:tnK7t0O24AGKn1glB+sSme3o9X5gt8niICMkDEMuioc=,tag:grs5kBt5GHNLk2K1Hcutog==,type:str]
34+
lastmodified: "2026-04-30T16:17:12Z"
35+
mac: ENC[AES256_GCM,data:kqtjOb9eAziiyyty+gToF+iadFJFnTKy8v8UftWHey868LNVL5Dq/TS8hmpYNLxzgFsu06uqHPmFNEIaeJQIPDL7ZwOdCKk6hf2tDx2BR1+EBEgGGoe9Hx7stuXGx0Vg+zhPv3/Z3yc+po46EtpuF+OyujOwWOBt2xbBEZL1yz4=,iv:A1h6EFCWD/1Oxzx7Lpt70yHKQWepiETnB9J+i8IE02g=,tag:7CBnxg3Dgp7tESpqLzeklQ==,type:str]
3836
unencrypted_suffix: _unencrypted
3937
version: 3.12.2

0 commit comments

Comments
 (0)