Commit 93abe6be authored by garciadeblas's avatar garciadeblas
Browse files

Add namespace oka and update jenkins and testacme okas to follow best practices 



Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parent f13e3cd5

oka/apps/jenkins-ns-params.yaml

0 → 100644
+1 −0
Original line number Diff line number Diff line 
namespace: jenkins

oka/apps/jenkins/manifests/jenkins-hr.yaml

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ spec: 
        kind: HelmRepository

        name: bitnamicharts

        namespace: jenkins

  install:

    createNamespace: true

  interval: 3m0s

  targetNamespace: jenkins

  values: {}

oka/apps/jenkins/templates/jenkins-ks.yaml

+26 −1
Original line number Diff line number Diff line
@@ -18,14 +18,39 @@ 
apiVersion: kustomize.toolkit.fluxcd.io/v1

kind: Kustomization

metadata:

  name: jenkins

  name: ${APPNAME}

  namespace: flux-system

spec:

  interval: 1h0m0s

  path: ./apps/jenkins/manifests

  prune: true

  targetNamespace: ${TARGET_NS}

  wait: true

  sourceRef:

    kind: GitRepository

    name: sw-catalogs

    namespace: flux-system

  patches:

    # - target:

    #     kind: Namespace

    #     version: v1

    #     name: jenkins

    #   patch: |-

    #     kind: Namespace

    #     metadata:

    #       name: ${TARGET_NS}

    - target:

        kind: HelmRelease

        version: v2beta1

        name: jenkins

        namespace: jenkins

      patch: |-

        - op: replace

          path: /metadata/name

          value: ${APPNAME}

        - op: replace

          path: /spec/chart/spec/sourceRef/namespace

          value: ${TARGET_NS}

        - op: replace

          path: /spec/targetNamespace

          value: ${TARGET_NS}

oka/apps/namespace/manifests/namespace.yaml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#######################################################################################

# Copyright ETSI Contributors and Others.

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#    http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

# implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#######################################################################################

---

apiVersion: v1

kind: Namespace

metadata:

  name: mynamespace

  annotations:

    kustomize.toolkit.fluxcd.io/ssa: "IfNotPresent"

oka/apps/namespace/templates/namespace-ks.yaml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
#######################################################################################

# Copyright ETSI Contributors and Others.

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#    http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

# implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#######################################################################################

---

apiVersion: kustomize.toolkit.fluxcd.io/v1

kind: Kustomization

metadata:

  name: ${APPNAME}

  namespace: flux-system

spec:

  interval: 1h0m0s

  path: ./apps/namespace/manifests

  prune: true

  # deletionPolicy: Orphan

  sourceRef:

    kind: GitRepository

    name: sw-catalogs

    namespace: flux-system

  patches:

    - target:

        kind: Namespace

        version: v1

        name: mynamespace

      patch: |-

        - op: replace

          path: /metadata/name

          value: ${TARGET_NS}