Skip to content

Commit

Permalink
feat: add status information (#28)
Browse files Browse the repository at this point in the history
  • Loading branch information
isindir authored Oct 10, 2020
1 parent b90d65f commit 1cd0cac
Show file tree
Hide file tree
Showing 22 changed files with 323 additions and 58 deletions.
69 changes: 65 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,21 +1,82 @@
root = true

; Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
charset = utf-8
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = tab
indent_size = 4
max_line_length = 80
max_line_length = 120

; Makefiles
[*Makefile*]
indent_size = 2

[*.yml]
; Python
[*.py]
indent_style = space

; Hy Language
[*.hy]
indent_style = space
indent_size = 2

[*.{scala,rb,java,groovy}]
indent_style = space
indent_size = 2

; GoLang
[*.go]
indent_style = tab
max_line_length = 120

; YAML
[*.{yml,yaml}]
indent_style = space
indent_size = 2

; terraform
[*.{tf,tfvars}]
max_line_length = 0
indent_size = 2

; Javascript, Typescript, json
[*.{ts,js,json}]
indent_style = space
indent_size = 2

[*.yaml]
; TOML
[*.{toml}]
indent_style = space
indent_size = 2

; Markdown
[*.{md,markdown}]
max_line_length = 0
indent_style = space
indent_size = 2
trim_trailing_whitespace = false

; HTML
[*.{html,css,scss,sass,less}]
indent_style = space
indent_size = 2

; shell
[*.{sh,bash,zsh,ksh}]
indent_style = space

; Dockerfile
[*Dockerfile*]
indent_style = space
indent_size = 2

; Jenkins Grovy
[*Jenkinsfile*]
max_line_length = 0
indent_style = space
indent_size = 2

[COMMIT_EDITMSG]
max_line_length = 0
182 changes: 160 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ keys
vendor
build/_output
build/_test
# Created by https://www.gitignore.io/api/go,vim,emacs,visualstudiocode

# Created by https://www.toptal.com/developers/gitignore/api/macos,emacs,vim,vscode,sublimetext,windows,linux,go,visualstudiocode
# Edit at https://www.toptal.com/developers/gitignore?templates=macos,emacs,vim,vscode,sublimetext,windows,linux,go,visualstudiocode

### Emacs ###
# -*- mode: gitignore; -*-
*~
Expand All @@ -18,66 +21,201 @@ build/_test
auto-save-list
tramp
.\#*

# Org-mode
.org-id-locations
*_archive

# flymake-mode
*_flymake.*

# eshell files
/eshell/history
/eshell/lastdir

# elpa packages
/elpa/

# reftex files
*.rel

# AUCTeX auto folder
/auto/

# cask packages
.cask/
dist/

# Flycheck
flycheck_*.el

# server auth directory
/server/

# projectiles files
.projectile
projectile-bookmarks.eld

# directory configuration
.dir-locals.el
# saveplace
places
# url cache
url/cache/
# cedet
ede-projects.el
# smex
smex-items
# company-statistics
company-statistics-cache.el
# anaconda-mode
anaconda-mode/

# network security
/network-security.data


### Go ###
# Binaries for programs and plugins
*.exe
*.exe~
*.dll
*.so
*.dylib
# Test binary, build with 'go test -c'

# Test binary, built with `go test -c`
*.test

# Output of the go coverage tool, specifically when used with LiteIDE
*.out

# Dependency directories (remove the comment below to include it)
# vendor/

### Go Patch ###
/vendor/
/Godeps/

### Linux ###

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### SublimeText ###
# Cache files for Sublime Text
*.tmlanguage.cache
*.tmPreferences.cache
*.stTheme.cache

# Workspace files are user-specific
*.sublime-workspace

# Project files should be checked into the repository, unless a significant
# proportion of contributors will probably not be using Sublime Text
# *.sublime-project

# SFTP configuration file
sftp-config.json

# Package control specific files
Package Control.last-run
Package Control.ca-list
Package Control.ca-bundle
Package Control.system-ca-bundle
Package Control.cache/
Package Control.ca-certs/
Package Control.merged-ca-bundle
Package Control.user-ca-bundle
oscrypto-ca-bundle.crt
bh_unicode_properties.cache

# Sublime-github package stores a github token in this file
# https://packagecontrol.io/packages/sublime-github
GitHub.sublime-settings

### Vim ###
# swap
.sw[a-p]
.*.sw[a-p]
# session
# Swap
[._]*.s[a-v][a-z]
!*.svg # comment out if you don't need vector files
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]

# Session
Session.vim
# temporary
Sessionx.vim

# Temporary
.netrwhist
# auto-generated tag files
# Auto-generated tag files
tags
# Persistent undo
[._]*.un~

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace

### VisualStudioCode Patch ###
# Ignore all local history of files
.history
# End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode
.ionide

### vscode ###

### Windows ###
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

# End of https://www.toptal.com/developers/gitignore/api/macos,emacs,vim,vscode,sublimetext,windows,linux,go,visualstudiocode
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SHELL := /bin/bash
GO := GO15VENDOREXPERIMENT=1 GO111MODULE=on GOPROXY=https://proxy.golang.org go
SOPS_SEC_OPERATOR_VERSION := 0.1.3
SOPS_SEC_OPERATOR_VERSION := 0.1.4

# https://github.com/kubernetes-sigs/controller-tools/releases
CONTROLLER_TOOLS_VERSION := "v0.2.5"
Expand Down
5 changes: 3 additions & 2 deletions api/v1alpha2/sopssecret_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,15 @@ type SopsSecretStatus struct {

// Message - SopsSecret status message
// +optional
Message string `json:"msg,omitempty"`
Message string `json:"message,omitempty"`
}

// +kubebuilder:object:root=true

// SopsSecret is the Schema for the sopssecrets API
// +kubebuilder:resource:shortName=sops,scope=Namespaced
// +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.msg`
// +kubebuilder:subresource:status
// +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.message`
type SopsSecret struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
4 changes: 4 additions & 0 deletions chart/helm2/sops-secrets-operator/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@
.idea/
*.tmproj
.vscode/
qqq.*
abc.*
*.qqq
*.abc
4 changes: 2 additions & 2 deletions chart/helm2/sops-secrets-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
version: 0.3.3
appVersion: 0.1.3
version: 0.3.4
appVersion: 0.1.4
description: sops secrets operator
name: sops-secrets-operator
sources:
Expand Down
2 changes: 1 addition & 1 deletion chart/helm2/sops-secrets-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replicaCount: 1 # Deployment replica count - should not be modified

image:
repository: isindir/sops-secrets-operator # Operator image
tag: 0.1.3 # Operator image tag
tag: 0.1.4 # Operator image tag
pullPolicy: Always # Operator image pull policy

imagePullSecrets: [] # Secrets to pull image from private docker repository
Expand Down
4 changes: 4 additions & 0 deletions chart/helm3/sops-secrets-operator/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@
.idea/
*.tmproj
.vscode/
qqq.*
abc.*
*.qqq
*.abc
4 changes: 2 additions & 2 deletions chart/helm3/sops-secrets-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
version: 0.4.4
appVersion: 0.1.3
version: 0.4.5
appVersion: 0.1.4
type: application
description: sops secrets operator
name: sops-secrets-operator
Expand Down
Loading

0 comments on commit 1cd0cac

Please sign in to comment.