Skip to content

Commit 2558fa2

Browse files
llazigushollazigusho
committed
Merge remote-tracking branch 'origin/feature/gitOpStyle'
# Conflicts: # .vscode/launch.json # Makefile # cmd/apply.go # cmd/applyNamespace.go # cmd/delete.go # cmd/root.go # realm/namespaces/_defaults.yaml # realm/values/env/dev/default/values.yaml
2 parents 63a59b3 + 2c2982a commit 2558fa2

24 files changed

+580
-228
lines changed

‎.vscode/launch.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,21 @@
4747
"host": "127.0.0.1",
4848
"program": "${workspaceRoot}/main.go",
4949
// "envFile": "${workspaceRoot}/.dev.env",
50-
"args": ["apply","--skip-deps","--diff-run", "-e","dev", "-n", "default","--app","dummy","monitoring"],
50+
"args": ["apply","--skip-deps","--diff-run", "-e","dev", "-n", "default","monitoring"],
51+
"showLog": true
52+
},
53+
{
54+
"name": "Launch Gitops",
55+
"type": "go",
56+
"request": "launch",
57+
"mode": "debug",
58+
"remotePath": "",
59+
"cwd": "${workspaceRoot}",
60+
"port": 2345,
61+
"host": "127.0.0.1",
62+
"program": "${workspaceRoot}/main.go",
63+
// "envFile": "${workspaceRoot}/.dev.env",
64+
"args": ["apply","-e","dev", "-n", "default","gitops-defs","--app","dummy","monitoring"],
5165
"showLog": true
5266
},
5367
{

‎Makefile

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
PROJECT_NAME := korgi
2-
SHELL := /usr/bin/env bash
3-
1+
PROJECT_NAME:=korgi
2+
GOFILES:=$(shell find . -name '*.go' | grep -v -E '(./vendor)')
43
OS := $(shell uname | tr '[:upper:]' '[:lower:]')
54
ARCH := amd64
65
LDFLAGS := -w -s
76
SRC := $(shell find . -type f -name '*.go' -print)
87
REPO := github.com/DataReply/korgi
9-
10-
bin: $(SRC)
8+
9+
run:
10+
go run main.go
11+
12+
all: clean check bin
13+
14+
bin: $(GOFILES)
1115
mkdir -p bin/${OS}/
12-
GOOS=${OS} GOARCH=${ARCH} go build -ldflags "${LDFLAGS}" -o bin/${OS}/korgi main.go
16+
GOOS=${OS} GOARCH=${ARCH} go build -a -tags musl -ldflags "$(LDFLAGS)" -o bin/${OS}/korgi main.go
1317

1418
gofmt:
1519
gofmt -w -s pkg/
@@ -32,7 +36,4 @@ clean:
3236
run:
3337
go run main.go
3438

35-
all: clean check bin
36-
3739
.PHONY: all
38-

‎cmd/apply.go

+10-110
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
66
You may obtain a copy of the License at
77
8-
http://www.apache.org/licenses/LICENSE-2.0
8+
http://www.apache.org/licenses/LICENSE-2.0
99
1010
Unless required by applicable law or agreed to in writing, software
1111
distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,122 +16,24 @@ limitations under the License.
1616
package cmd
1717

1818
import (
19-
"fmt"
20-
"os"
21-
"path/filepath"
22-
"strconv"
23-
24-
"github.com/DataReply/korgi/pkg/utils"
2519
"github.com/spf13/cobra"
20+
"os"
2621
)
2722

28-
func templateApp(app string, namespace string, inputFilePath string, appGroupDir string, lint bool) error {
29-
30-
targeAppDir := utils.ConcatDirs(appGroupDir, app)
31-
32-
err := os.MkdirAll(targeAppDir, os.ModePerm)
33-
if err != nil {
34-
return fmt.Errorf("creating app dir: %w", err)
35-
}
36-
if lint {
37-
err = helmfileEngine.Lint(app, inputFilePath)
38-
if err != nil {
39-
return err
40-
}
41-
}
42-
err = helmfileEngine.Template(app, namespace, inputFilePath, targeAppDir)
43-
if err != nil {
44-
return err
45-
}
46-
47-
return nil
48-
}
49-
50-
func getFinalOutputDir(outputDir string, isolated bool) string {
51-
if isolated {
52-
return utils.ConcatDirs(outputDir, strconv.FormatInt(execTime.UTC().Unix(), 10))
53-
}
54-
return outputDir
55-
}
56-
57-
func applyAppGroup(group string, namespace string, outputDir string, appFilter string, lint bool, dryRun bool, askUser bool) error {
58-
59-
log.V(0).Info("applying", "group", group, "namespace", namespace, "app", appFilter, "lint", lint, "dry", dryRun, "ask", askUser)
60-
namespaceDir := utils.GetNamespaceDir(namespace)
61-
if _, err := os.Stat(namespaceDir); os.IsNotExist(err) {
62-
return fmt.Errorf("%s directory does not exist", namespaceDir)
63-
}
64-
65-
appGroupDir := utils.ConcatDirs(namespaceDir, group)
66-
67-
targetAppGroupDir := utils.ConcatDirs(outputDir, namespace, group)
68-
69-
err := os.MkdirAll(targetAppGroupDir, os.ModePerm)
70-
if err != nil {
71-
return fmt.Errorf("creating group directory: %w", err)
72-
}
73-
74-
matches, err := filepath.Glob(appGroupDir + "/*")
75-
if err != nil {
76-
return fmt.Errorf("listing group directory: %w", err)
77-
}
78-
79-
for _, matchedAppFile := range matches {
80-
appFile := filepath.Base(matchedAppFile)
81-
if appFile != "_app_group.yaml" {
82-
app := utils.SanitzeAppName(appFile)
83-
if appFilter != "" {
84-
85-
if app != appFilter {
86-
continue
87-
}
88-
}
89-
90-
err = templateApp(app, namespace, matchedAppFile, targetAppGroupDir, lint)
91-
if err != nil {
92-
return fmt.Errorf("templating app: %w", err)
93-
}
94-
95-
}
96-
97-
}
98-
if !dryRun {
99-
if appFilter != "" {
100-
err = kappEngine.DeployApp(group+"-"+appFilter, utils.ConcatDirs(targetAppGroupDir, appFilter), namespace)
101-
if err != nil {
102-
return fmt.Errorf("running kapp deploy with appFilter: %w", err)
103-
}
104-
return nil
105-
}
106-
107-
err = kappEngine.DeployGroup(group, targetAppGroupDir, namespace)
108-
if err != nil {
109-
return fmt.Errorf("running kapp deploy: %w", err)
110-
}
111-
}
112-
113-
return nil
114-
}
115-
11623
// applyCmd represents the apply command
11724
var applyCmd = &cobra.Command{
118-
Use: "apply",
119-
Short: "Apply resources to k8s",
120-
Args: cobra.ExactArgs(1),
25+
Use: "apply",
26+
Short: "Apply resources to k8s",
27+
Args: cobra.ExactArgs(1),
28+
TraverseChildren: true,
12129
RunE: func(cmd *cobra.Command, args []string) error {
12230

12331
namespace, _ := cmd.Flags().GetString("namespace")
124-
12532
lint, _ := cmd.Flags().GetBool("lint")
126-
12733
dryRun, _ := cmd.Flags().GetBool("dry-run")
128-
12934
appFilter, _ := cmd.Flags().GetString("app")
130-
13135
outputDir, _ := cmd.Flags().GetString("output-dir")
132-
13336
isolated, _ := cmd.Flags().GetBool("isolate")
134-
13537
askForConfirmation, _ := cmd.Flags().GetBool("ask-for-confirmation")
13638

13739
if !askForConfirmation {
@@ -144,21 +46,19 @@ var applyCmd = &cobra.Command{
14446
}
14547
}
14648

147-
err := applyAppGroup(args[0], namespace, getFinalOutputDir(outputDir, isolated), appFilter, lint, dryRun, askForConfirmation)
49+
err := applyAppGroup(args[0], namespace, getFinalOutputDir(outputDir, isolated), appFilter, lint, dryRun, defaultMatcher, askForConfirmation)
14850
if err != nil {
14951
return err
15052
}
151-
15253
return nil
15354
},
15455
}
15556

15657
func init() {
15758
rootCmd.AddCommand(applyCmd)
158-
159-
applyCmd.Flags().BoolP("lint", "l", false, "Lint temlate")
160-
applyCmd.Flags().BoolP("dry-run", "d", false, "Dry Run")
161-
applyCmd.Flags().StringP("namespace", "n", "", "Target namespace")
59+
applyCmd.PersistentFlags().BoolP("lint", "l", false, "Lint temlate")
60+
applyCmd.PersistentFlags().BoolP("dry-run", "d", false, "Dry Run")
61+
applyCmd.PersistentFlags().StringP("namespace", "n", "", "Target namespace")
16262
applyCmd.MarkFlagRequired("namespace")
16363

16464
}

‎cmd/applyGitOps.go

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
Copyright © 2020 Artyom Topchyan [email protected]
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
package cmd
17+
18+
import (
19+
"github.com/spf13/cobra"
20+
)
21+
22+
// applyAppDefs represents the apply command
23+
var applyAppDefs = &cobra.Command{
24+
Use: "gitops-manifests",
25+
Short: "Apply custom definition for generated app resources to k8s",
26+
Args: cobra.ExactArgs(1),
27+
RunE: func(cmd *cobra.Command, args []string) error {
28+
err := runApplyWithMatch(cmd, args, gitOpsMatcher)
29+
if err != nil {
30+
return err
31+
}
32+
return nil
33+
34+
},
35+
}
36+
37+
func init() {
38+
applyCmd.AddCommand(applyAppDefs)
39+
}

0 commit comments

Comments
 (0)