Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merging 6298/6299/6300/6301/6302/6303/6304/6305/6306 to prod #6307

Merged
merged 18 commits into from
Sep 30, 2024
Merged

merging 6298/6299/6300/6301/6302/6303/6304/6305/6306 to prod #6307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3bb6208
update data8 image tag to 84d9c800dba0: deployments/data8/hubploy.yaml
Sep 30, 2024
5619309
update a11y image tag to fe7dcc02d586: deployments/a11y/hubploy.yaml
Sep 30, 2024
06b8609
update data102 image tag to 1ae8a9184467: deployments/data102/hubploy…
Sep 30, 2024
b28e928
update edx image tag to 44cfbcb5cc13: deployments/edx/hubploy.yaml
Sep 30, 2024
19ea9d4
update data100 image tag to 511c4637d702: deployments/data100/hubploy…
Sep 30, 2024
d379e25
update data101 image tag to 48a90d76171a: deployments/data101/hubploy…
Sep 30, 2024
6114929
update logodev image tag to 166722c68e0d: deployments/logodev/hubploy…
Sep 30, 2024
e521ff5
update publichealth image tag to 017e1f8f1a30: deployments/publicheal…
Sep 30, 2024
1a6fbc7
Merge pull request #6304 from berkeley-dsep-infra/update-data8-image-…
shaneknapp Sep 30, 2024
0f08d67
Merge pull request #6305 from berkeley-dsep-infra/update-a11y-image-t…
shaneknapp Sep 30, 2024
d81388e
Merge pull request #6303 from berkeley-dsep-infra/update-data102-imag…
shaneknapp Sep 30, 2024
b0c9848
Merge pull request #6302 from berkeley-dsep-infra/update-edx-image-ta…
shaneknapp Sep 30, 2024
9f38ffa
Merge pull request #6301 from berkeley-dsep-infra/update-data100-imag…
shaneknapp Sep 30, 2024
cd66398
Merge pull request #6298 from berkeley-dsep-infra/update-publichealth…
shaneknapp Sep 30, 2024
a7e27b1
Merge pull request #6299 from berkeley-dsep-infra/update-logodev-imag…
shaneknapp Sep 30, 2024
5306668
Merge pull request #6300 from berkeley-dsep-infra/update-data101-imag…
shaneknapp Sep 30, 2024
6cc0b68
fixed broken var name
shaneknapp Sep 30, 2024
7fd1167
Merge pull request #6306 from shaneknapp/fix-var-name-img-repo-script
shaneknapp Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deployments/a11y/hubploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:65e4cb99b4aa
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:fe7dcc02d586

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/data100/hubploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image:d3a95b9af686
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image:511c4637d702

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/data101/hubploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data101-user-image:010ca9abfb71
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data101-user-image:48a90d76171a

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/data102/hubploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data102-user-image:ba17dfb0e793
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data102-user-image:1ae8a9184467

registry:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/data8/hubploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data8-user-image:949086545647
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data8-user-image:84d9c800dba0

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/edx/hubploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/data8x-scratch/user-images/edx-user-image:64d38046ca94
- name: us-central1-docker.pkg.dev/data8x-scratch/user-images/edx-user-image:44cfbcb5cc13

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/logodev/hubploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
images:
images:
# temporary update
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/logodev-user-image:ae0f4c4e7753
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/logodev-user-image:166722c68e0d

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/publichealth/hubploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/publichealth-user-image:8b70e125f905
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/publichealth-user-image:017e1f8f1a30

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion scripts/user-image-management/manage-image-repos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ def push(args):
if not os.path.exists(path):
print(f"Skipping {name} as it doesn't exist.")
continue
print(f"Pushing {name} to {args.origin}...")
if not args.origin:
remote = "origin"
else:
remote = args.origin
print(f"Pushing {name} to {remote}...")
subprocess.check_call(["git", "push", remote, args.branch], cwd=path)
print()

Expand Down
Loading