Skip to content

Commit 59f445c

Browse files
authored
Merge pull request #8 from rustrial/feature/k8s-v1.31
Feature/k8s v1.31
2 parents 2031ac6 + b5d0db4 commit 59f445c

13 files changed

+310
-305
lines changed

.devcontainer/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM nexxiot-registry-oci.jfrog.io/golang:1.23.2-alpine3.20
2+
3+
RUN apk --no-cache add git bash make

.devcontainer/devcontainer.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"build": {
3+
"dockerfile": "./Dockerfile"
4+
},
5+
"mounts": [
6+
"source=${localEnv:HOME}/.aws,target=/root/.aws,type=bind,consistency=cached",
7+
"source=${localEnv:HOME}/.gitconfig,target=/root/.gitconfig,type=bind,consistency=cached"
8+
],
9+
"customizations": {
10+
"vscode": {
11+
"extensions": [
12+
"GitLab.gitlab-workflow",
13+
"golang.go",
14+
"ms-vscode.makefile-tools",
15+
"ms-azuretools.vscode-docker",
16+
"mhutchie.git-graph"
17+
]
18+
}
19+
}
20+
}

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup Go
2525
uses: actions/setup-go@v3
2626
with:
27-
go-version: 1.22.x
27+
go-version: 1.23.x
2828
- name: Setup Kubernetes
2929
uses: helm/[email protected]
3030
with:

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
- name: Setup Go
106106
uses: actions/setup-go@v3
107107
with:
108-
go-version: 1.22.x
108+
go-version: 1.23.x
109109
- name: Build seals CLI
110110
run: make cli
111111
- name: Extract TAG_NAME from GITHUB_REF

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.22 as builder
2+
FROM golang:1.23.2 as builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
152152
ENVTEST ?= $(LOCALBIN)/setup-envtest
153153

154154
## Tool Versions
155-
KUSTOMIZE_VERSION ?= v5.3.0
156-
CONTROLLER_TOOLS_VERSION ?= v0.15.0
155+
KUSTOMIZE_VERSION ?= v5.5.0
156+
CONTROLLER_TOOLS_VERSION ?= v0.16.5
157157

158158
.PHONY: kustomize
159159
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.

charts/k8s-gitops-secrets-controller/crds/secrets.rustrial.org_keyencryptionkeypolicies.yaml

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: keyencryptionkeypolicies.secrets.rustrial.org
88
spec:
99
group: secrets.rustrial.org
@@ -21,33 +21,44 @@ spec:
2121
API
2222
properties:
2323
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2729
type: string
2830
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3237
type: string
3338
metadata:
3439
type: object
3540
spec:
3641
description: KeyEncryptionKeyPolicySpec defines the desired state of KeyEncryptionKeyPolicy
3742
properties:
3843
keyEncryptionKeyId:
39-
description: "KeyEncryptionKeyId is the provider specific unique ID
40-
of the Key Encryption Key (KEK) use to encrypt/decrypt the Data
41-
Encryption Key (DEK). \n This ID must uniquely identify the KEK
42-
and provider and is used in authorization rules to decide which
43-
namespaces can access which KEKs."
44+
description: |-
45+
KeyEncryptionKeyId is the provider specific unique ID of
46+
the Key Encryption Key (KEK) use to encrypt/decrypt the
47+
Data Encryption Key (DEK).
48+
49+
This ID must uniquely identify the KEK and provider and
50+
is used in authorization rules to decide which namespaces
51+
can access which KEKs.
4452
type: string
4553
namespaces:
46-
description: White-list of namespaces, which are entitled to use this
47-
KEK to decrypt DataEncrpytionKeys.
54+
description: |-
55+
White-list of namespaces, which are entitled to use this KEK
56+
to decrypt DataEncrpytionKeys.
4857
items:
4958
type: string
5059
type: array
60+
required:
61+
- keyEncryptionKeyId
5162
type: object
5263
status:
5364
description: KeyEncryptionKeyPolicyStatus defines the observed state of

0 commit comments

Comments
 (0)