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.

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

Add k8s with fixed conflicts #201

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open

Conversation

kristofferlarberg
Copy link
Contributor

@kristofferlarberg kristofferlarberg commented Dec 22, 2022

Description

This pr fixes conflicts with main and feat/k8s #153

Status

Awaiting checks that the Kubernetes setup is working correctly(?) before possible to merge. This pr should be merged and #153 should be removed.

@vercel
Copy link

vercel bot commented Dec 22, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated
iteam-next-site ❌ Failed (Inspect) Dec 23, 2022 at 4:49PM (UTC)
iteam-next-site-cms ✅ Ready (Inspect) Visit Preview 💬 Add your feedback Dec 23, 2022 at 4:49PM (UTC)

irony
irony previously approved these changes Dec 23, 2022
@@ -12,6 +12,8 @@ export const previewClient = createClient({
token: process.env.SANITY_API_TOKEN,
})

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Borde tas bort

@kristofferlarberg kristofferlarberg changed the title Fix conflicts and add k8s Fix k8s conflicts Feb 1, 2023
@kristofferlarberg kristofferlarberg changed the base branch from main to feat/k8s February 1, 2023 11:07
@kristofferlarberg kristofferlarberg dismissed irony’s stale review February 1, 2023 11:07

The base branch was changed.

@kristofferlarberg kristofferlarberg changed the title Fix k8s conflicts Add k8s with fixed conflicts Feb 1, 2023
@kristofferlarberg kristofferlarberg changed the base branch from feat/k8s to main February 1, 2023 11:09
@kristofferlarberg kristofferlarberg marked this pull request as ready for review February 1, 2023 11:09
@kristofferlarberg kristofferlarberg removed their assignment Feb 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants