Comments (6)
thockin
commented on July 19, 2024
Can you post a complete but minimal repro? I am having a hard time parsing
all that, and still have questions :)
…On Feb 26, 2017 3:09 AM, "Analect" ***@***.***> wrote:
I was able to get git-sync working with these settings. I also was having
trouble getting GIT_SYNC_ONE_TIME working and so just added an
arbitrarily high GIT_SYNC_WAIT to achieve that single first pull/clone.
{
"name": "git-sync",
"image": "gcr.io/google_containers/git-sync-amd64:v2.0.4",
"imagePullPolicy": "Always",
"env": [{
"name": "GIT_SYNC_REPO",
"value": ***@***.***:group/test-repo"
}, {
"name": "GIT_SYNC_BRANCH",
"value": "master"
},{
"name": "GIT_SYNC_DEST",
"value": "master"
}, {
"name": "GIT_SYNC_SSH",
"value": "true"
}, {
"name": "GIT_SYNC_WAIT",
"value": "99999"
}],
"securityContext": {
"runAsUser": 0
},
"volumeMounts": [{
"name": "git-secret",
"mountPath": "/etc/git-secret"
}, {
"name": "repo",
"mountPath": "/git"
}]
}
My other container (to which the above acts as a sidecar) includes the
following settings:
{
"name": "git-secret",
"mountPath": "/etc/git-secret"
}, {
"name": "repo",
"mountPath": "/home/jovyan/repo"
}
So that has given me ssh capability back in the main container and synced
files to /home/jovyan/repo, which is all fine.
Perhaps the next part is by design, but maybe someone more familiar with
the workings of this can explain or perhaps suggest a work-around.
My main objective is to clone a repo to a compute environment I'm working
with and have the ability to push back changes to the repo before I leave
that compute environment.
So in my main container running that compute environment, the repo has
been cloned and mounted to /home/jovyan/repo and, as per the logs from
the git-sync container below, folders have been added for master and rev-
f9d0af287de930b7495145c716b1d4fcca88673e .
cloned ***@***.***:group/test-repo.git
2017-02-26T10:35:14.794399416Z I0226 10:35:14.794334 1 main.go:268] syncing to HEAD (f9d0af287de930b7495145c716b1d4fcca88673e)
2017-02-26T10:35:15.341912965Z I0226 10:35:15.341767 1 main.go:281] added worktree /git/rev-f9d0af287de930b7495145c716b1d4fcca88673e for origin/master
2017-02-26T10:35:15.346189283Z I0226 10:35:15.346089 1 main.go:301] reset worktree /git/rev-f9d0af287de930b7495145c716b1d4fcca88673e to f9d0af287de930b7495145c716b1d4fcca88673e
Back on my compute environment, it is the repo folder that is the git
folder (see output from running git status) and eventhough both the master
and rev-f9*** folders have .git sub-directories (see red arrow below),
these aren't recognised as git repos.
The problem is, based on this new imposed structure, git thinks I have
deleted all my files from my repos root folder (see 3) and added them into
sub-folders (see 1). If I add these changes and push back to my repo, then
it's going to get all screwed up.
Am I using this tool the wrong way, or was it not intended to manage the
pushing changes back to the repo, but instead just emphasising the pulling
part.
[image: image]
<https://cloud.githubusercontent.com/assets/4063815/23339073/324b8966-fc12-11e6-9ca2-e21a726a0b95.png>
I would appreciate anyone's insights on this. Thanks.
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#40>, or mute the thread
<https://github.com/notifications/unsubscribe-auth/AFVgVJnRulllnhpO0g48RCmrpLRWp-Ifks5rgV12gaJpZM4MMWE_>
.
from git-sync.
Analect
commented on July 19, 2024
Can you post a complete but minimal repro?
@thockin ... sorry for delay in coming back to you on this.
I created a repro repo here: https://github.com/Analect/test-sync
It uses the same demo as this repo .. ie. git-sync/hugo/nginx
It differs a bit from the demo on here in that it's adding ssh via shared etc\secret-git folder and the github-git-creds (the private key used to access github ... eventhough I've left this project as public) is added to my kubernetes cluster using: kubectl create secret generic github-git-creds --from-file=ssh=/home/user/.ssh/id_rsa
Just run up the pod from /test-sync/demo/config: kubectl create -f pod.yaml
Run: kubectl exec -it blog-pod -c hugo /bin/bash to enter the hugo container.
I'm trying to emulate my use-case here ... where my main app (to which I add git-sync as a sidecar) has a terminal from which I want to be able to interact with the remote repo using git.
Navigate to src folder:
This seems to suggest that src is a git folder
root@blog-pod:/src# ls
git rev-024e5cfc2ac5fec2fef5a5901ad9e8038d8509da
root@blog-pod:/src# git remote -v
origin [email protected]:Analect/test-sync.git (fetch)
origin [email protected]:Analect/test-sync.git (push)
root@blog-pod:/src# git show --summary
commit 024e5cfc2ac5fec2fef5a5901ad9e8038d8509da
Date: Mon Mar 20 13:09:40 2017 +0000
changing path for where to find themes
However, if you run a git-status from this folder, it shows the following ... that it will delete all these files ... and instead track the two subfolders git and rev-024e5cfc2ac5fec2fef5a5901ad9e8038d8509da which is obviously not what I want.
root@blog-pod:/src# git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
deleted: README.md
deleted: demo/blog/archetypes/.keep
deleted: demo/blog/config.toml
deleted: demo/blog/content/about.md
deleted: demo/blog/content/post/first.md
deleted: demo/blog/layouts/.keep
deleted: demo/blog/static/.keep
deleted: demo/blog/themes/dimension/.gitignore
deleted: demo/blog/themes/dimension/LICENSE.md
deleted: demo/blog/themes/dimension/README.md
deleted: demo/blog/themes/dimension/archetypes/default.md
deleted: demo/blog/themes/dimension/exampleSite/config.toml
deleted: demo/blog/themes/dimension/exampleSite/content/about.de.md
deleted: demo/blog/themes/dimension/exampleSite/content/about.md
deleted: demo/blog/themes/dimension/exampleSite/content/contact.de.md
deleted: demo/blog/themes/dimension/exampleSite/content/contact.md
deleted: demo/blog/themes/dimension/exampleSite/content/elements.md
deleted: demo/blog/themes/dimension/exampleSite/content/formspree.md
deleted: demo/blog/themes/dimension/exampleSite/content/intro.de.md
deleted: demo/blog/themes/dimension/exampleSite/content/intro.md
deleted: demo/blog/themes/dimension/exampleSite/content/work.de.md
deleted: demo/blog/themes/dimension/exampleSite/content/work.md
deleted: demo/blog/themes/dimension/exampleSite/static/images/pic01.jpg
deleted: demo/blog/themes/dimension/exampleSite/static/images/pic02.jpg
deleted: demo/blog/themes/dimension/exampleSite/static/images/pic03.jpg
deleted: demo/blog/themes/dimension/images/screenshot.png
deleted: demo/blog/themes/dimension/images/tn.png
deleted: demo/blog/themes/dimension/layouts/404.html
deleted: demo/blog/themes/dimension/layouts/_default/list.html
deleted: demo/blog/themes/dimension/layouts/_default/onepagestyle.html
deleted: demo/blog/themes/dimension/layouts/_default/single.html
deleted: demo/blog/themes/dimension/layouts/index.html
deleted: demo/blog/themes/dimension/layouts/partials/footer.html
deleted: demo/blog/themes/dimension/layouts/partials/header.html
deleted: demo/blog/themes/dimension/layouts/robots.txt
deleted: demo/blog/themes/dimension/layouts/shortcodes/gmaps.html
deleted: demo/blog/themes/dimension/layouts/shortcodes/socialLinks.html
deleted: demo/blog/themes/dimension/layouts/sitemap.xml
deleted: demo/blog/themes/dimension/static/css/font-awesome.min.css
deleted: demo/blog/themes/dimension/static/css/ie9.css
deleted: demo/blog/themes/dimension/static/css/main.css
deleted: demo/blog/themes/dimension/static/css/noscript.css
deleted: demo/blog/themes/dimension/static/css/project.css
deleted: demo/blog/themes/dimension/static/fonts/FontAwesome.otf
deleted: demo/blog/themes/dimension/static/fonts/fontawesome-webfont.eot
deleted: demo/blog/themes/dimension/static/fonts/fontawesome-webfont.svg
deleted: demo/blog/themes/dimension/static/fonts/fontawesome-webfont.ttf
deleted: demo/blog/themes/dimension/static/fonts/fontawesome-webfont.woff
deleted: demo/blog/themes/dimension/static/fonts/fontawesome-webfont.woff2
deleted: demo/blog/themes/dimension/static/images/bg.jpg
deleted: demo/blog/themes/dimension/static/images/overlay.png
deleted: demo/blog/themes/dimension/static/js/jquery.min.js
deleted: demo/blog/themes/dimension/static/js/main.js
deleted: demo/blog/themes/dimension/static/js/skel.min.js
deleted: demo/blog/themes/dimension/static/js/util.js
deleted: demo/blog/themes/dimension/static/sass/base/_page.scss
deleted: demo/blog/themes/dimension/static/sass/base/_typography.scss
deleted: demo/blog/themes/dimension/static/sass/components/_box.scss
deleted: demo/blog/themes/dimension/static/sass/components/_button.scss
deleted: demo/blog/themes/dimension/static/sass/components/_form.scss
deleted: demo/blog/themes/dimension/static/sass/components/_icon.scss
deleted: demo/blog/themes/dimension/static/sass/components/_image.scss
deleted: demo/blog/themes/dimension/static/sass/components/_list.scss
deleted: demo/blog/themes/dimension/static/sass/components/_table.scss
deleted: demo/blog/themes/dimension/static/sass/ie9.scss
deleted: demo/blog/themes/dimension/static/sass/layout/_bg.scss
deleted: demo/blog/themes/dimension/static/sass/layout/_footer.scss
deleted: demo/blog/themes/dimension/static/sass/layout/_header.scss
deleted: demo/blog/themes/dimension/static/sass/layout/_main.scss
deleted: demo/blog/themes/dimension/static/sass/layout/_wrapper.scss
deleted: demo/blog/themes/dimension/static/sass/libs/_functions.scss
deleted: demo/blog/themes/dimension/static/sass/libs/_mixins.scss
deleted: demo/blog/themes/dimension/static/sass/libs/_skel.scss
deleted: demo/blog/themes/dimension/static/sass/libs/_vars.scss
deleted: demo/blog/themes/dimension/static/sass/main.scss
deleted: demo/blog/themes/dimension/static/sass/noscript.scss
deleted: demo/blog/themes/dimension/theme.toml
deleted: demo/blog/themes/hyde/LICENSE.md
deleted: demo/blog/themes/hyde/README.md
deleted: demo/blog/themes/hyde/archetypes/default.md
deleted: demo/blog/themes/hyde/images/screenshot.png
deleted: demo/blog/themes/hyde/images/tn.png
deleted: demo/blog/themes/hyde/layouts/404.html
deleted: demo/blog/themes/hyde/layouts/_default/list.html
deleted: demo/blog/themes/hyde/layouts/_default/single.html
deleted: demo/blog/themes/hyde/layouts/index.html
deleted: demo/blog/themes/hyde/layouts/partials/disqus.html
deleted: demo/blog/themes/hyde/layouts/partials/head.html
deleted: demo/blog/themes/hyde/layouts/partials/sidebar.html
deleted: demo/blog/themes/hyde/static/apple-touch-icon-144-precomposed.png
deleted: demo/blog/themes/hyde/static/css/hyde.css
deleted: demo/blog/themes/hyde/static/css/poole.css
deleted: demo/blog/themes/hyde/static/css/syntax.css
deleted: demo/blog/themes/hyde/static/favicon.png
deleted: demo/blog/themes/hyde/theme.toml
deleted: demo/config/pod.yaml
Untracked files:
(use "git add <file>..." to include in what will be committed)
git
rev-024e5cfc2ac5fec2fef5a5901ad9e8038d8509da/
If I navigate down a level into /src/git, it tells me this is no longer a git folder.
root@blog-pod:/src/git# git show --summary
fatal: Not a git repository: ../.git/worktrees/rev-024e5cfc2ac5fec2fef5a5901ad9e8038d8509da
Maybe I'm misunderstanding what the objective of git-sync is. My use-case is to take an initial pull from a repo and then from the cloned folder (which is shared via volume) to be able to interact directly back with the remote repo using git. However, there's some transformation that's happening the cloned folder which makes it unworkable.
I'm hoping this makes things a bit clearer for you.
from git-sync.
stp-ip
commented on July 19, 2024
The issue as far as I understand is by design.
git-sync usage is pull based. So the main usage is just to pull in content into a local directory not to push it back again.
If the only issue you are having is concerning the usage of symlinks, which messes up the directory structure you could try using the GIT_SYNC_ATOMIC to false.
For now I would say this is a won't fix as the tool is working as intended. If it works via turning off atomic switched, a PR to document this use case could be accepted.
This PR would most likely add the following:
- docs/push.md as file for the docs
- add steps to use git-sync for writing back to the git repo
- add limitations around not using atomic sync (as a warning on top)
from git-sync.
stp-ip
commented on July 19, 2024
Closing for now. If your issue was misunderstood, please feel free to reopen.
It is definitely an interesting use-case and a PR can be submitted separately.
from git-sync.
Analect
commented on July 19, 2024
@stp-ip
I ran up the pod with the GIT_SYNC_ATOMIC set to false (see settings lower down), but it doesn't appear to change the behaviour. I was looking in main.go for evidence of the parameter GIT_SYNC_ATOMIC and wasn't able to find any. Am I missing something? The only other mention of it in this repo is in isssue #15.
spec:
containers:
- env:
- name: GIT_SYNC_REPO
value: [email protected]:Analect/test-sync.git
- name: GIT_SYNC_DEST
value: git
- name: GIT_SYNC_SSH
value: "true"
- name: GIT_SYNC_WAIT
value: "99999"
- name: GIT_SYNC_ATOMIC
value: "false"
image: gcr.io/google_containers/git-sync:v2.0.4
imagePullPolicy: Always
name: git-sync
from git-sync.
stp-ip
commented on July 19, 2024
You are right. Switching the atomic operation via the mentioned flag isn't available. Will open another issue to get that tracked. So for now no pushing back to your repo via git-sync possible. As I said, just not the main use-case for git-sync.
from git-sync.
Related Issues (20)
- Sync on tag addition? HOT 11
- Simplify inner loop
- Consider putting the local repo in a subdir of the --root HOT 3
- Wrong path for check of local git hash HOT 3
- Error msg exposes token in URL HOT 4
- GitLab via ssh key HOT 3
- How to disable commit hash in the target folder? HOT 2
- Allow the submodule functionality for repos copied using vcs tool HOT 1
- Temporarily missing files when using $GITSYNC_LINK HOT 4
- Remediate security vulnerabilities on 4.1.0 HOT 5
- High vulnerability CVE-2023-6246 and CVE-2023-6779 HOT 1
- Issue with PYTHONPATH Resolution in git-sync 4.0.0 HOT 2
- v4 slack webhook HOT 6
- exechook behavior HOT 4
- Remediate 4.2.2 security vulnerabilities HOT 1
- Support GitHub App authentication HOT 6
- TODO: infra to make #878 work HOT 1
- Curious about real example raising race condition when using v3 HOT 1
- exechook working HOT 8
- TODO: shellcheck test_e2e.sh and test_git.sh HOT 5
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from git-sync.