Skip to content

Commit

Permalink
Revert "Refactor (#83)" (#84)
Browse files Browse the repository at this point in the history
This reverts commit 6c4ec32.
  • Loading branch information
TimothyStiles authored Sep 9, 2023
1 parent 6c4ec32 commit 4799377
Show file tree
Hide file tree
Showing 143 changed files with 130,192 additions and 471 deletions.
13 changes: 0 additions & 13 deletions .devcontainer/Dockerfile

This file was deleted.

8 changes: 0 additions & 8 deletions .devcontainer/app.env

This file was deleted.

23 changes: 23 additions & 0 deletions .devcontainer/dev/.helmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
14 changes: 14 additions & 0 deletions .devcontainer/dev/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: v2
name: ark-dev
description: Dev Helm chart for Ark developer environment
type: application
version: 0.0.0
appVersion: 1.20.2

# Bitnami charts are served from GitHub CDN - See https://github.com/bitnami/charts/issues/10539 for details
dependencies:
# Chart release date: 2023-07 (https://github.com/bitnami/charts/blob/main/bitnami/postgresql/Chart.yaml)
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 12.6.6
condition: postgresql.enabled
Binary file added .devcontainer/dev/charts/postgresql-12.6.6.tgz
Binary file not shown.
4 changes: 4 additions & 0 deletions .devcontainer/dev/templates/configmap.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-configmap
48 changes: 35 additions & 13 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,45 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/go-postgres
// README at: https://github.com/devcontainers/templates/tree/main/src/kubernetes-helm-minikube
{
"name": "Go & PostgreSQL",
"dockerComposeFile": "docker-compose.yml",
"service": "app",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}"

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Configure tool-specific properties.
// "customizations": {},
"name": "ark-devcontainer",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/base:bullseye",

"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"enableNonRootDocker": "true",
"moby": "true"
},
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
"version": "latest",
"helm": "latest",
"minikube": "latest"
},
"ghcr.io/devcontainers/features/go:1": {
"version": "latest",
"golangciLintVersion": "latest"
},
"ghcr.io/mpriscella/features/kind:1": {
"version": "latest"
}
},

"extensions": ["golang.go","premparihar.gotestexplorer","github.vscode-pull-request-github","eamodio.gitlens"],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [5432],
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "go version",
// "postCreateCommand": "kubectl version",

// Use 'postStartCommand' to run commands after the container is created like starting minikube.
"postStartCommand": "kind create cluster && helm install dev .devcontainer/dev",
// "postStartCommand": "nohup bash -c 'minikube start &' > minikube.log 2>&1 && helm install dev .devcontainer/dev",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}

38 changes: 0 additions & 38 deletions .devcontainer/docker-compose.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2023 Timothy Stiles, Keoni Gandall
Copyright 2021 Keoni Gandall, Timothy Stiles

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
1 change: 1 addition & 0 deletions app/app.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package app
1 change: 1 addition & 0 deletions client/client.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package client
Loading

0 comments on commit 4799377

Please sign in to comment.