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

fix: reconcilerTemplate metadata spec #157

Merged
merged 1 commit into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
## Release process

### Controller release
1. Merge all pr's to master which need to be part of the new release
2. Create pr to master and bump the kustomization base
3. Push a tag following semantic versioning prefixed by 'v'. Do not create a github release, this is done automatically.
4. Create a new pr and add the following changes:
1. Bump chart version
2. Bump charts app version

### Helm chart change only
1. Bump the helm chart version in the pr
2. Push a tag following semantic versioning prefixed by 'v'. Do not create a github release, this is done automatically.
3. Wait until all artifacts are published.
31 changes: 26 additions & 5 deletions PROJECT
Original file line number Diff line number Diff line change
@@ -1,13 +1,34 @@
domain: doodle.com
repo: github.com/DoodleScheduling/keycloak-controller
layout:
- go.kubebuilder.io/v3
projectName: keycloak-controller
repo: github.com/doodlescheduling/keycloak-controller
resources:
- group: keycloak.infra.doodle.com
- api:
crdVersion: v1
namespaced: true
controller: true
domain: doodle.com
group: keycloak.infra.doodle.com
kind: KeycloakRealm
path: github.com/doodlescheduling/keycloak-controller/api/v1beta1
version: v1beta1
- group: keycloak.infra.doodle.com
- api:
crdVersion: v1
namespaced: true
controller: true
domain: doodle.com
group: keycloak.infra.doodle.com
kind: KeycloakClient
path: github.com/doodlescheduling/keycloak-controller/api/v1beta1
version: v1beta1
- group: keycloak.infra.doodle.com
- api:
crdVersion: v1
namespaced: true
controller: true
domain: doodle.com
group: keycloak.infra.doodle.com
kind: KeycloakUser
path: github.com/doodlescheduling/keycloak-controller/api/v1beta1
version: v1beta1
version: "2"
version: "3"
30 changes: 29 additions & 1 deletion api/v1beta1/keycloakrealm_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ type KeycloakRealmSpec struct {

// Reconciler defines the pod spec for the reconciler
// +optional
ReconcilerTemplate *corev1.Pod `json:"reconcilerTemplate,omitempty"`
ReconcilerTemplate *ReconcilerTemplate `json:"reconcilerTemplate,omitempty"`

// Version is the keycloak version
// +optional
Expand All @@ -82,6 +82,34 @@ type KeycloakRealmSpec struct {
ResourceSelector *metav1.LabelSelector `json:"resourceSelector,omitempty"`
}

type ReconcilerTemplate struct {
// Standard object's metadata.
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
// +optional
ObjectMetadata `json:"metadata,omitempty"`

// Specification of the desired behavior of the pod.
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
// +optional
Spec corev1.PodSpec `json:"spec,omitempty"`
}

type ObjectMetadata struct {
// Map of string keys and values that can be used to organize and categorize
// (scope and select) objects. May match selectors of replication controllers
// and services.
// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels
// +optional
Labels map[string]string `json:"labels,omitempty"`

// Annotations is an unstructured key value map stored with a resource that may be
// set by external tools to store and retrieve arbitrary metadata. They are not
// queryable and should be preserved when modifying objects.
// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
// +optional
Annotations map[string]string `json:"annotations,omitempty"`
}

// SecretReference is a named reference to a secret which contains user credentials
type SecretReference struct {
// Name referrs to the name of the secret, must be located whithin the same namespace
Expand Down
49 changes: 47 additions & 2 deletions api/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading