diff --git a/config/bundle/manifest.yaml b/config/bundle/manifest.yaml index e833d85..bb719d2 100644 --- a/config/bundle/manifest.yaml +++ b/config/bundle/manifest.yaml @@ -1,26 +1,4 @@ --- -apiVersion: v1 -kind: Service -metadata: - annotations: {} - labels: - app: jsonnet-controller - control_plane: manager - name: jsonnet-controller - namespace: flux-system -spec: - ports: - - name: http - port: 9443 - targetPort: 9443 - - name: metrics - port: 8080 - targetPort: 8080 - selector: - app: jsonnet-controller - control_plane: manager - type: ClusterIP ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -427,7 +405,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/pelotech/jsonnet-controller:latest + image: ghcr.io/pelotech/jsonnet-controller:v0.0.2 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -475,33 +453,6 @@ spec: - emptyDir: {} name: manager-tmp --- -apiVersion: v1 -kind: ServiceAccount -metadata: - annotations: {} - labels: - app: jsonnet-controller - control_plane: manager - name: jsonnet-controller-sa - namespace: flux-system ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - annotations: {} - labels: - app: jsonnet-controller - control_plane: manager - name: jsonnet-controller-cluster-admin-binding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin -subjects: -- kind: ServiceAccount - name: jsonnet-controller-sa - namespace: flux-system ---- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: @@ -620,3 +571,52 @@ rules: - get - list - watch +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + app: jsonnet-controller + control_plane: manager + name: jsonnet-controller-sa + namespace: flux-system +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: {} + labels: + app: jsonnet-controller + control_plane: manager + name: jsonnet-controller-cluster-admin-binding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin +subjects: +- kind: ServiceAccount + name: jsonnet-controller-sa + namespace: flux-system +--- +apiVersion: v1 +kind: Service +metadata: + annotations: {} + labels: + app: jsonnet-controller + control_plane: manager + name: jsonnet-controller + namespace: flux-system +spec: + ports: + - name: http + port: 9443 + targetPort: 9443 + - name: metrics + port: 8080 + targetPort: 8080 + selector: + app: jsonnet-controller + control_plane: manager + type: ClusterIP diff --git a/config/jsonnet/jsonnet-controller.jsonnet b/config/jsonnet/jsonnet-controller.jsonnet index 120108e..00f538d 100644 --- a/config/jsonnet/jsonnet-controller.jsonnet +++ b/config/jsonnet/jsonnet-controller.jsonnet @@ -1,7 +1,7 @@ local kube = import 'https://github.com/bitnami-labs/kube-libsonnet/raw/v1.14.6/kube.libsonnet'; local kubecfg = import 'internal://lib/kubecfg.libsonnet'; -function(version='v0.0.1') { +function(version='v0.0.2') { local this = self, // The prefix to use for names of resources