Skip to content

Commit 1272bcd

Browse files
authored
Merge pull request #75 from k8sstormcenter/ddelnano/remove-k8s-directory-pin
Remove k8s/ directory pins with cert-manager changes upstreamed
2 parents 53d09cc + 5af3d65 commit 1272bcd

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

tools/private/copybara/copy.bara.sky

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@ ignored_dirs = [
3434
".github/workflows/trivy_images.yaml",
3535
"DEVELOPMENT.md", # Should be moved to a fork only file
3636
"ci/github/bazelrc", # fork-specific bazelrc REPO_URL
37-
"k8s/**", # cert-manager support (upstream)
37+
# The k8s cloud/vizier cert-manager changes are upstreamed, so the tree is no
38+
# longer frozen. Only the files below keep intentional fork-only divergence and
39+
# stay pinned; fork-only k8s additions are protected via fork_only_files below.
40+
"k8s/cloud/dev/plugin_db_updater_job.yaml", # fork PL_PLUGIN_REPO override
41+
"k8s/cloud/overlays/plugin_job/plugin_job.yaml", # fork PL_PLUGIN_REPO override
42+
"k8s/vizier/BUILD.bazel", # fork adaptive_export image entry
43+
"k8s/cloud/overlays/exposed_services_traefik/**", # To be upstreamed
3844
"scripts/create_cloud_secrets.sh", # cert-manager support (upstream)
3945
"skaffold/**",
4046
"bazel/repositories.bzl", # to be upstreamed

0 commit comments

Comments
 (0)